From ad4e916c7d479332a9be785bafc8140da72f132e Mon Sep 17 00:00:00 2001 From: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Tue, 28 Jun 2022 21:59:50 +0200 Subject: [PATCH 01/10] e (#14639) --- _maps/map_files/YogStation/YogStation.dmm | 276 ++++++++-------------- 1 file changed, 99 insertions(+), 177 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index bd2a90c1f556..d9df52bd83e6 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -183,10 +183,6 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) -"abd" = ( -/obj/machinery/bounty_board, -/turf/closed/wall, -/area/science/lab) "abe" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -13731,9 +13727,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"bgc" = ( -/turf/closed/wall/r_wall, -/area/science/lab) "bgh" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -14039,34 +14032,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/research) -"bhC" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd"; - name = "research lab shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plating, -/area/science/lab) -"bhD" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/southright{ - name = "Research and Development Desk"; - req_access_txt = "7" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plating, -/area/science/lab) "bhE" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty{ @@ -14338,19 +14303,6 @@ }, /turf/open/floor/plasteel/white, /area/science/research) -"biS" = ( -/obj/machinery/camera{ - c_tag = "Research Division Access" - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/science/research) "biT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -14407,15 +14359,6 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) -"biY" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/starboard) "bja" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15288,12 +15231,6 @@ "bnp" = ( /turf/open/floor/plasteel, /area/science/lab) -"bnr" = ( -/obj/structure/plasticflaps{ - opacity = 1 - }, -/turf/open/floor/plating, -/area/science/lab) "bnu" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -15629,9 +15566,6 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) -"boB" = ( -/turf/closed/wall, -/area/science/lab) "boC" = ( /obj/machinery/door/airlock/mining/glass{ name = "Quartermaster"; @@ -16188,11 +16122,6 @@ /obj/structure/chair/stool, /turf/open/floor/plating, /area/maintenance/fore) -"bro" = ( -/turf/open/floor/plasteel/white/side{ - dir = 10 - }, -/area/science/research) "brp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -30595,6 +30524,15 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) +"fJH" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/closed/indestructible/riveted, +/area/maintenance/starboard) "fJS" = ( /obj/machinery/button/door{ id = "bridge blast"; @@ -31763,14 +31701,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) -"gsd" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/science/lab) "gsx" = ( /obj/effect/landmark/start/cyborg, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -46282,21 +46212,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/storage) -"npe" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/door/airlock/research/glass{ - name = "R&D Lab"; - req_access_txt = "7" - }, -/turf/open/floor/plasteel/white, -/area/science/lab) "npo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/official/help_others{ @@ -47673,6 +47588,18 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing/chamber) +"oao" = ( +/obj/item/folder/white, +/obj/structure/table, +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, +/obj/item/paicard{ + pixel_x = 4 + }, +/turf/closed/indestructible/riveted, +/area/science/lab) "oaF" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -49524,18 +49451,6 @@ /obj/item/stock_parts/subspace/analyzer, /turf/open/floor/plasteel/white, /area/storage/tech) -"oRC" = ( -/obj/item/folder/white, -/obj/structure/table, -/obj/item/disk/tech_disk, -/obj/item/disk/tech_disk, -/obj/item/disk/design_disk, -/obj/item/disk/design_disk, -/obj/item/paicard{ - pixel_x = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/lab) "oRG" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -51198,6 +51113,9 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"pTz" = ( +/turf/closed/indestructible/riveted, +/area/science/research) "pTL" = ( /obj/structure/sign/departments/minsky/engineering/telecommmunications{ pixel_y = 32 @@ -54174,10 +54092,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/aft) -"ryf" = ( -/obj/structure/sign/departments/minsky/research/research, -/turf/closed/wall/r_wall, -/area/science/lab) "rym" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -56788,29 +56702,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/medical/sleeper) -"sGR" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/research/glass{ - name = "R&D Lab"; - req_access_txt = "7" - }, -/turf/open/floor/plasteel/white, -/area/science/lab) "sGW" = ( /obj/machinery/atmospherics/pipe/simple/purple/visible{ dir = 5 @@ -57270,6 +57161,21 @@ }, /turf/open/floor/plasteel, /area/quartermaster/qm) +"sTv" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/closed/indestructible/riveted, +/area/maintenance/starboard) "sTw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4; @@ -58813,6 +58719,19 @@ }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) +"tEo" = ( +/obj/machinery/camera{ + c_tag = "Research Division Access" + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/closed/indestructible/riveted, +/area/science/research) "tEp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -64901,6 +64820,9 @@ /obj/structure/window/reinforced, /turf/open/floor/plasteel, /area/security/prison) +"wQS" = ( +/turf/closed/indestructible/riveted, +/area/space) "wRg" = ( /obj/machinery/flasher{ id = "AI"; @@ -115932,13 +115854,13 @@ aYV vLR bfZ bhA -biS +tEo aMK dcg bvx boz bnJ -bBD +pTz bBD aNr bBD @@ -116188,14 +116110,14 @@ aYV jKG mYV bga -bgc -bgc -bgc -bgc -bgc -boB -boB -boB +wQS +wQS +wQS +wQS +wQS +wQS +wQS +wQS btb bmU bvJ @@ -116445,15 +116367,15 @@ aYV aYV vLR bfX -bhC +wQS biU bks blI bnn boA -oRC -abd -bgp +oao +wQS +pTz bmU bvJ bCk @@ -116702,15 +116624,15 @@ aYV aYV vLR bfX -bhD +wQS biV biW blK bnp boA boQ -gsd -bro +wQS +pTz bmU bvJ bxj @@ -116959,15 +116881,15 @@ aYV bdv vLR bgb -bhC +wQS biU biW blJ bno bkt biW -npe -bgp +wQS +pTz bmU bvK bxi @@ -117215,15 +117137,15 @@ bbF aYV aYV vLR -ryf -bgc +wQS +wQS biX bhV bka bka aCl bpo -sGR +wQS brp bmW bvK @@ -117472,7 +117394,7 @@ aCR bcy bdx beG -bgc +wQS bhE biW bkv @@ -117480,7 +117402,7 @@ blL biW bnh biW -gsd +wQS bte bmX bvK @@ -117729,7 +117651,7 @@ aMZ nhP wmI beI -bgc +wQS bhF dEY bib @@ -117737,7 +117659,7 @@ bki bmJ bnl bpq -boB +wQS bta bmY bvK @@ -117986,15 +117908,15 @@ aZd aTk aPq beH -bgc -bgc -bgc -bgc -bgc -bgc -bgc +wQS +wQS +wQS +wQS +wQS +wQS +wQS giP -bgc +wQS wMP bmZ bvK @@ -118245,13 +118167,13 @@ bdz beJ xtQ bhH -biY -biY -biY -bjS -bnr +fJH +fJH +fJH +sTv +wQS bpr -bgc +wQS blx bna bvM @@ -118506,9 +118428,9 @@ hoc hoc hoc bjT -boB -bgc -bgc +wQS +wQS +wQS bsk bsF aCN From 5e16af4be54b47fcf2dcffafca18fb4888fd9cc6 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Mon, 1 Aug 2022 15:35:12 -0400 Subject: [PATCH 02/10] Squashed commit of the following: commit ad4e916c7d479332a9be785bafc8140da72f132e Author: TheGamerdk <5618080+TheGamerdk@users.noreply.github.com> Date: Tue Jun 28 21:59:50 2022 +0200 e (#14639) --- _maps/map_files/YogStation/YogStation.dmm | 268 ++++++++-------------- 1 file changed, 99 insertions(+), 169 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 1061612fed01..d9df52bd83e6 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -183,10 +183,6 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) -"abd" = ( -/obj/machinery/bounty_board, -/turf/closed/wall, -/area/science/lab) "abe" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -13731,9 +13727,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) -"bgc" = ( -/turf/closed/wall/r_wall, -/area/science/lab) "bgh" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -14039,34 +14032,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/research) -"bhC" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd"; - name = "research lab shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plating, -/area/science/lab) -"bhD" = ( -/obj/structure/table/reinforced, -/obj/machinery/door/window/southright{ - name = "Research and Development Desk"; - req_access_txt = "7" - }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plating, -/area/science/lab) "bhE" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty{ @@ -14338,19 +14303,6 @@ }, /turf/open/floor/plasteel/white, /area/science/research) -"biS" = ( -/obj/machinery/camera{ - c_tag = "Research Division Access" - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/plasteel/white, -/area/science/research) "biT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -14407,15 +14359,6 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) -"biY" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/plating, -/area/maintenance/starboard) "bja" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15288,12 +15231,6 @@ "bnp" = ( /turf/open/floor/plasteel, /area/science/lab) -"bnr" = ( -/obj/structure/plasticflaps{ - opacity = 1 - }, -/turf/open/floor/plating, -/area/science/lab) "bnu" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -15629,9 +15566,6 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) -"boB" = ( -/turf/closed/wall, -/area/science/lab) "boC" = ( /obj/machinery/door/airlock/mining/glass{ name = "Quartermaster"; @@ -16188,11 +16122,6 @@ /obj/structure/chair/stool, /turf/open/floor/plating, /area/maintenance/fore) -"bro" = ( -/turf/open/floor/plasteel/white/side{ - dir = 10 - }, -/area/science/research) "brp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -30595,6 +30524,15 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) +"fJH" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/closed/indestructible/riveted, +/area/maintenance/starboard) "fJS" = ( /obj/machinery/button/door{ id = "bridge blast"; @@ -31763,14 +31701,6 @@ }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) -"gsd" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/science/lab) "gsx" = ( /obj/effect/landmark/start/cyborg, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -39992,25 +39922,6 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) -"klU" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/plasteel/white, -/area/science/lab) "klZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -47677,6 +47588,18 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing/chamber) +"oao" = ( +/obj/item/folder/white, +/obj/structure/table, +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, +/obj/item/paicard{ + pixel_x = 4 + }, +/turf/closed/indestructible/riveted, +/area/science/lab) "oaF" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -49528,18 +49451,6 @@ /obj/item/stock_parts/subspace/analyzer, /turf/open/floor/plasteel/white, /area/storage/tech) -"oRC" = ( -/obj/item/folder/white, -/obj/structure/table, -/obj/item/disk/tech_disk, -/obj/item/disk/tech_disk, -/obj/item/disk/design_disk, -/obj/item/disk/design_disk, -/obj/item/paicard{ - pixel_x = 4 - }, -/turf/open/floor/plasteel/white, -/area/science/lab) "oRG" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -51202,6 +51113,9 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) +"pTz" = ( +/turf/closed/indestructible/riveted, +/area/science/research) "pTL" = ( /obj/structure/sign/departments/minsky/engineering/telecommmunications{ pixel_y = 32 @@ -54178,10 +54092,6 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/aft) -"ryf" = ( -/obj/structure/sign/departments/minsky/research/research, -/turf/closed/wall/r_wall, -/area/science/lab) "rym" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -57251,6 +57161,21 @@ }, /turf/open/floor/plasteel, /area/quartermaster/qm) +"sTv" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/closed/indestructible/riveted, +/area/maintenance/starboard) "sTw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4; @@ -58794,6 +58719,19 @@ }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) +"tEo" = ( +/obj/machinery/camera{ + c_tag = "Research Division Access" + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/closed/indestructible/riveted, +/area/science/research) "tEp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -61950,17 +61888,6 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) -"vku" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "rnd2"; - name = "research lab shutters" - }, -/obj/machinery/door/firedoor/border_only{ - dir = 1 - }, -/obj/machinery/door/firedoor/border_only, -/turf/open/floor/plasteel/white, -/area/science/lab) "vkJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -64893,6 +64820,9 @@ /obj/structure/window/reinforced, /turf/open/floor/plasteel, /area/security/prison) +"wQS" = ( +/turf/closed/indestructible/riveted, +/area/space) "wRg" = ( /obj/machinery/flasher{ id = "AI"; @@ -115924,13 +115854,13 @@ aYV vLR bfZ bhA -biS +tEo aMK dcg bvx boz bnJ -bBD +pTz bBD aNr bBD @@ -116180,14 +116110,14 @@ aYV jKG mYV bga -bgc -bgc -bgc -bgc -bgc -boB -boB -boB +wQS +wQS +wQS +wQS +wQS +wQS +wQS +wQS btb bmU bvJ @@ -116437,15 +116367,15 @@ aYV aYV vLR bfX -bhC +wQS biU bks blI bnn boA -oRC -abd -bgp +oao +wQS +pTz bmU bvJ bCk @@ -116694,15 +116624,15 @@ aYV aYV vLR bfX -bhD +wQS biV biW blK bnp boA boQ -gsd -bro +wQS +pTz bmU bvJ bxj @@ -116951,15 +116881,15 @@ aYV bdv vLR bgb -bhC +wQS biU biW blJ bno bkt biW -vku -bgp +wQS +pTz bmU bvK bxi @@ -117207,15 +117137,15 @@ bbF aYV aYV vLR -ryf -bgc +wQS +wQS biX bhV bka bka aCl bpo -klU +wQS brp bmW bvK @@ -117464,7 +117394,7 @@ aCR bcy bdx beG -bgc +wQS bhE biW bkv @@ -117472,7 +117402,7 @@ blL biW bnh biW -gsd +wQS bte bmX bvK @@ -117721,7 +117651,7 @@ aMZ nhP wmI beI -bgc +wQS bhF dEY bib @@ -117729,7 +117659,7 @@ bki bmJ bnl bpq -boB +wQS bta bmY bvK @@ -117978,15 +117908,15 @@ aZd aTk aPq beH -bgc -bgc -bgc -bgc -bgc -bgc -bgc +wQS +wQS +wQS +wQS +wQS +wQS +wQS giP -bgc +wQS wMP bmZ bvK @@ -118237,13 +118167,13 @@ bdz beJ xtQ bhH -biY -biY -biY -bjS -bnr +fJH +fJH +fJH +sTv +wQS bpr -bgc +wQS blx bna bvM @@ -118498,9 +118428,9 @@ hoc hoc hoc bjT -boB -bgc -bgc +wQS +wQS +wQS bsk bsF aCN From 7fb014c081799c0c1d3ff85bf9d562f745f292f8 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Mon, 1 Aug 2022 15:50:04 -0400 Subject: [PATCH 03/10] Update YogStation.dmm --- _maps/map_files/YogStation/YogStation.dmm | 268 ++++++++++++++-------- 1 file changed, 169 insertions(+), 99 deletions(-) diff --git a/_maps/map_files/YogStation/YogStation.dmm b/_maps/map_files/YogStation/YogStation.dmm index 93996b7a7192..74d6f52576d3 100644 --- a/_maps/map_files/YogStation/YogStation.dmm +++ b/_maps/map_files/YogStation/YogStation.dmm @@ -183,6 +183,10 @@ }, /turf/open/floor/plasteel, /area/ai_monitored/security/armory) +"abd" = ( +/obj/machinery/bounty_board, +/turf/closed/wall, +/area/science/lab) "abe" = ( /obj/machinery/airalarm{ pixel_y = 24 @@ -13568,6 +13572,9 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/starboard) +"bgc" = ( +/turf/closed/wall/r_wall, +/area/science/lab) "bgh" = ( /obj/machinery/door/airlock/maintenance{ req_access_txt = "12" @@ -13890,6 +13897,34 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/science/research) +"bhC" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd"; + name = "research lab shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plating, +/area/science/lab) +"bhD" = ( +/obj/structure/table/reinforced, +/obj/machinery/door/window/southright{ + name = "Research and Development Desk"; + req_access_txt = "7" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd"; + name = "research lab shutters" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plating, +/area/science/lab) "bhE" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty{ @@ -14161,6 +14196,19 @@ }, /turf/open/floor/plasteel/white, /area/science/research) +"biS" = ( +/obj/machinery/camera{ + c_tag = "Research Division Access" + }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/plasteel/white, +/area/science/research) "biT" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -14217,6 +14265,15 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) +"biY" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/plating, +/area/maintenance/starboard) "bja" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -15082,6 +15139,12 @@ "bnp" = ( /turf/open/floor/plasteel, /area/science/lab) +"bnr" = ( +/obj/structure/plasticflaps{ + opacity = 1 + }, +/turf/open/floor/plating, +/area/science/lab) "bnu" = ( /obj/machinery/door/firedoor/border_only{ dir = 8 @@ -15417,6 +15480,9 @@ }, /turf/open/floor/plasteel/white, /area/science/lab) +"boB" = ( +/turf/closed/wall, +/area/science/lab) "boC" = ( /obj/machinery/door/airlock/mining/glass{ name = "Quartermaster"; @@ -15973,6 +16039,11 @@ /obj/structure/chair/stool, /turf/open/floor/plating, /area/maintenance/fore) +"bro" = ( +/turf/open/floor/plasteel/white/side{ + dir = 10 + }, +/area/science/research) "brp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -30274,15 +30345,6 @@ }, /turf/open/floor/plasteel/dark, /area/bridge) -"fJH" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/closed/indestructible/riveted, -/area/maintenance/starboard) "fJS" = ( /obj/machinery/button/door{ id = "bridge blast"; @@ -31442,6 +31504,14 @@ }, /turf/open/floor/plasteel/white, /area/medical/genetics/cloning) +"gsd" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "research lab shutters" + }, +/obj/effect/spawner/structure/window/reinforced, +/turf/open/floor/plating, +/area/science/lab) "gsx" = ( /obj/effect/landmark/start/cyborg, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -39674,6 +39744,25 @@ }, /turf/open/floor/plasteel, /area/hallway/primary/port) +"klU" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "research lab shutters" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/plasteel/white, +/area/science/lab) "klZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -47670,18 +47759,6 @@ }, /turf/open/floor/plasteel/white, /area/science/mixing/chamber) -"oao" = ( -/obj/item/folder/white, -/obj/structure/table, -/obj/item/disk/tech_disk, -/obj/item/disk/tech_disk, -/obj/item/disk/design_disk, -/obj/item/disk/design_disk, -/obj/item/paicard{ - pixel_x = 4 - }, -/turf/closed/indestructible/riveted, -/area/science/lab) "oaF" = ( /obj/machinery/door/firedoor/border_only{ dir = 4 @@ -49545,6 +49622,18 @@ /obj/item/stock_parts/subspace/analyzer, /turf/open/floor/plasteel/white, /area/storage/tech) +"oRC" = ( +/obj/item/folder/white, +/obj/structure/table, +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, +/obj/item/paicard{ + pixel_x = 4 + }, +/turf/open/floor/plasteel/white, +/area/science/lab) "oRG" = ( /obj/structure/table, /obj/machinery/cell_charger, @@ -51224,9 +51313,6 @@ }, /turf/open/floor/plasteel/dark/telecomms, /area/tcommsat/server) -"pTz" = ( -/turf/closed/indestructible/riveted, -/area/science/research) "pTL" = ( /obj/structure/sign/departments/minsky/engineering/telecommmunications{ pixel_y = 32 @@ -54248,6 +54334,10 @@ /obj/machinery/door/firedoor/border_only, /turf/open/floor/plating, /area/maintenance/aft) +"ryf" = ( +/obj/structure/sign/departments/minsky/research/research, +/turf/closed/wall/r_wall, +/area/science/lab) "rym" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -57339,21 +57429,6 @@ }, /turf/open/floor/plasteel, /area/quartermaster/qm) -"sTv" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/closed/indestructible/riveted, -/area/maintenance/starboard) "sTw" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4; @@ -58921,19 +58996,6 @@ }, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) -"tEo" = ( -/obj/machinery/camera{ - c_tag = "Research Division Access" - }, -/obj/structure/sink{ - dir = 4; - pixel_x = 11 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/closed/indestructible/riveted, -/area/science/research) "tEp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -62113,6 +62175,17 @@ }, /turf/open/floor/plasteel, /area/maintenance/disposal/incinerator) +"vku" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "rnd2"; + name = "research lab shutters" + }, +/obj/machinery/door/firedoor/border_only{ + dir = 1 + }, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plasteel/white, +/area/science/lab) "vkJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -65015,9 +65088,6 @@ /obj/structure/window/reinforced, /turf/open/floor/plasteel, /area/security/prison) -"wQS" = ( -/turf/closed/indestructible/riveted, -/area/space) "wRg" = ( /obj/machinery/flasher{ id = "AI"; @@ -116016,13 +116086,13 @@ aYV vLR bfZ bhA -tEo +biS aMK dcg bvx boz bnJ -pTz +bBD bBD aNr bBD @@ -116272,14 +116342,14 @@ aYV jKG mYV bga -wQS -wQS -wQS -wQS -wQS -wQS -wQS -wQS +bgc +bgc +bgc +bgc +bgc +boB +boB +boB btb bmU bvJ @@ -116529,15 +116599,15 @@ aYV aYV vLR bfX -wQS +bhC biU bks blI bnn boA -oao -wQS -pTz +oRC +abd +bgp bmU bvJ bCk @@ -116786,15 +116856,15 @@ aYV aYV vLR bfX -wQS +bhD biV biW blK bnp boA boQ -wQS -pTz +gsd +bro bmU bvJ bxj @@ -117043,15 +117113,15 @@ aYV bdv vLR bgb -wQS +bhC biU biW blJ bno bkt biW -wQS -pTz +vku +bgp bmU bvK bxi @@ -117299,15 +117369,15 @@ bbF aYV aYV vLR -wQS -wQS +ryf +bgc biX bhV bka bka aCl bpo -wQS +klU brp bmW bvK @@ -117556,7 +117626,7 @@ aCR bcy bdx beG -wQS +bgc bhE biW bkv @@ -117564,7 +117634,7 @@ blL biW bnh biW -wQS +gsd bte bmX bvK @@ -117813,7 +117883,7 @@ aMZ nhP wmI beI -wQS +bgc bhF dEY bib @@ -117821,7 +117891,7 @@ bki bmJ bnl bpq -wQS +boB bta bmY bvK @@ -118070,15 +118140,15 @@ aZd aTk aPq beH -wQS -wQS -wQS -wQS -wQS -wQS -wQS +bgc +bgc +bgc +bgc +bgc +bgc +bgc giP -wQS +bgc wMP bmZ bvK @@ -118329,13 +118399,13 @@ bdz beJ xtQ bhH -fJH -fJH -fJH -sTv -wQS +biY +biY +biY +bjS +bnr bpr -wQS +bgc blx bna bvM @@ -118590,9 +118660,9 @@ hoc hoc hoc bjT -wQS -wQS -wQS +boB +bgc +bgc bsk bsF aCN From 64e3ad1b14f63a0549b00b79082df9f8e04c2ac8 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Wed, 3 Aug 2022 20:44:44 -0400 Subject: [PATCH 04/10] adds the Shitty Emag --- code/datums/components/crafting/makeshift.dm | 12 +++++ code/game/objects/items/cards_ids.dm | 43 ++++++++++++++++++ code/game/objects/items/granters.dm | 2 +- .../code/game/objects/items/cards_ids.dm | 2 + yogstation/icons/obj/card.dmi | Bin 9724 -> 10609 bytes 5 files changed, 58 insertions(+), 1 deletion(-) diff --git a/code/datums/components/crafting/makeshift.dm b/code/datums/components/crafting/makeshift.dm index 7ca46e0089e4..be1c92306ce8 100644 --- a/code/datums/components/crafting/makeshift.dm +++ b/code/datums/components/crafting/makeshift.dm @@ -88,6 +88,18 @@ category = CAT_TOOLS always_availible = FALSE +/datum/crafting_recipe/makeshiftemag + name = "Improvised Emag" + reqs = list(/obj/item/stock_parts/subspace/amplifier = 1, + /obj/item/card/id = 1, + /obj/item/electronics/firelock = 1, + /obj/item/stack/cable_coil = 10) + tools = list(TOOL_MULTITOOL, TOOL_WIRECUTTER) + result = /obj/item/card/emag/improvised + time = 12 SECONDS + category = CAT_TOOLS + always_availible = FALSE + /datum/crafting_recipe/makeshiftid name = "Makeshift ID" result = /obj/item/card/id/makeshift diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 1096ba6d5de1..e89261397a45 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -68,6 +68,7 @@ righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi' item_flags = NO_MAT_REDEMPTION | NOBLUDGEON var/prox_check = TRUE //If the emag requires you to be in range + var/can_bluespace = TRUE //can this become a bluespace emag? /obj/item/card/emag/bluespace name = "bluespace cryptographic sequencer" @@ -75,6 +76,48 @@ color = rgb(40, 130, 255) prox_check = FALSE +/obj/item/card/emag/improvised + name = "improvised cryptographic sequencer" + desc = "It's a card with some junk circuitry strapped to it. It doesn't look like it would be reliable or fast due to shoddy construction, and needs to be manually recharged with uranium sheets." + icon_state = "emag_shitty" + can_bluespace = FALSE //oh god no + var/charges = 5 //how many times can we use the emag before needing to reload it? + var/max_charges = 5 + +/obj/item/card/emag/improvised/afterattack(atom/target, mob/user, proximity) + if(charges > 0) + if(!proximity && prox_check) //left in for badmins + return + if(do_after(user, rand(50, 100), src)) + var/atom/A = target + charges-- + if (prob(40)) + to_chat(user, span_notice("You fail to use [src] on the [A]!")) + return + if (prob(5)) + var/mob/living/M = loc + M.adjust_fire_stacks(1) + M.IgniteMob() + to_chat(user, span_danger("The card shorts out and catches fire in your hands!")) + log_combat(user, A, "attempted to emag") + if (!istype(A, /obj/machinery/computer/cargo)) + A.emag_act(user) + else + to_chat(user, span_notice("The cheap circuitry isn't strong enough to subvert this!")) + +/obj/item/card/emag/improvised/attackby(obj/item/W, mob/user, params) + . = ..() + if (max_charges > charges) + if (istype(W, /obj/item/stack/sheet/mineral/uranium)) + var/obj/item/stack/sheet/mineral/uranium/T = W + T.use(1) + charges++ + to_chat(user, span_notice("You add another charge to the [src]. It now has [charges] uses remaining.")) + +/obj/item/card/emag/improvised/examine(mob/user) + . = ..() + . += span_notice("The charge meter indicates that it has [charges] charges remaining out of [max_charges].") + /obj/item/card/emag/attack() return diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index e3575748d999..3937ea421468 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -439,7 +439,7 @@ /obj/item/book/granter/crafting_recipe/weapons name = "makeshift weapons 101" desc = "A book filled with directions on how to make various weaponry." - crafting_recipe_types = list(/datum/crafting_recipe/baseball_bat, /datum/crafting_recipe/lance, /datum/crafting_recipe/knifeboxing, /datum/crafting_recipe/flamethrower, /datum/crafting_recipe/pipebomb, /datum/crafting_recipe/makeshiftpistol, /datum/crafting_recipe/makeshiftmagazine, /datum/crafting_recipe/makeshiftsuppressor, /datum/crafting_recipe/makeshiftcrowbar, /datum/crafting_recipe/makeshiftwrench, /datum/crafting_recipe/makeshiftwirecutters, /datum/crafting_recipe/makeshiftweldingtool, /datum/crafting_recipe/makeshiftmultitool, /datum/crafting_recipe/makeshiftscrewdriver, /datum/crafting_recipe/makeshiftknife, /datum/crafting_recipe/makeshiftpickaxe, /datum/crafting_recipe/makeshiftradio, /datum/crafting_recipe/bola_arrow, /datum/crafting_recipe/flaming_arrow) + crafting_recipe_types = list(/datum/crafting_recipe/baseball_bat, /datum/crafting_recipe/lance, /datum/crafting_recipe/knifeboxing, /datum/crafting_recipe/flamethrower, /datum/crafting_recipe/pipebomb, /datum/crafting_recipe/makeshiftpistol, /datum/crafting_recipe/makeshiftmagazine, /datum/crafting_recipe/makeshiftsuppressor, /datum/crafting_recipe/makeshiftcrowbar, /datum/crafting_recipe/makeshiftwrench, /datum/crafting_recipe/makeshiftwirecutters, /datum/crafting_recipe/makeshiftweldingtool, /datum/crafting_recipe/makeshiftmultitool, /datum/crafting_recipe/makeshiftscrewdriver, /datum/crafting_recipe/makeshiftknife, /datum/crafting_recipe/makeshiftpickaxe, /datum/crafting_recipe/makeshiftradio, /datum/crafting_recipe/bola_arrow, /datum/crafting_recipe/flaming_arrow, /datum/crafting_recipe/makeshiftemag) icon_state = "bookCrafting" oneuse = TRUE diff --git a/yogstation/code/game/objects/items/cards_ids.dm b/yogstation/code/game/objects/items/cards_ids.dm index d90497564994..4fd445edc3e4 100644 --- a/yogstation/code/game/objects/items/cards_ids.dm +++ b/yogstation/code/game/objects/items/cards_ids.dm @@ -72,6 +72,8 @@ var/otherEmag = user.get_active_held_item() if(!otherEmag) return + if(!can_bluespace) + return if(prob(10)) to_chat(user, span_notice("By some ungodly miracle, the emag gains new functionality instead of being destroyed.")) playsound(src.loc, "sparks", 50, 1) diff --git a/yogstation/icons/obj/card.dmi b/yogstation/icons/obj/card.dmi index c3d3663a8e1cc19497738c88d5c769bb9b5555de..69138ff9b2a364fc030eabb8cc86235236552550 100644 GIT binary patch literal 10609 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 literal 9724 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 E7mUCjQUCw| From 77441fc2eab1502029c122e97cbe39f5ab115459 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Wed, 3 Aug 2022 23:09:07 -0400 Subject: [PATCH 05/10] antispam plus suggestions --- code/game/objects/items/cards_ids.dm | 25 +++++++++++-------- .../code/game/objects/items/cards_ids.dm | 2 +- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index e89261397a45..b0b2c45d2a4b 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -68,7 +68,6 @@ righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi' item_flags = NO_MAT_REDEMPTION | NOBLUDGEON var/prox_check = TRUE //If the emag requires you to be in range - var/can_bluespace = TRUE //can this become a bluespace emag? /obj/item/card/emag/bluespace name = "bluespace cryptographic sequencer" @@ -80,30 +79,34 @@ name = "improvised cryptographic sequencer" desc = "It's a card with some junk circuitry strapped to it. It doesn't look like it would be reliable or fast due to shoddy construction, and needs to be manually recharged with uranium sheets." icon_state = "emag_shitty" - can_bluespace = FALSE //oh god no var/charges = 5 //how many times can we use the emag before needing to reload it? var/max_charges = 5 + var/emagging //are we currently emagging something -/obj/item/card/emag/improvised/afterattack(atom/target, mob/user, proximity) +/obj/item/card/emag/improvised/afterattack(atom/target, mob/user, proximity) if(charges > 0) + if(emagging) + return if(!proximity && prox_check) //left in for badmins return - if(do_after(user, rand(50, 100), src)) - var/atom/A = target + emagging = TRUE + if(do_after(user, rand(5, 10) SECONDS, src)) charges-- if (prob(40)) - to_chat(user, span_notice("You fail to use [src] on the [A]!")) + to_chat(user, span_notice("[src] emits a puff of smoke, but nothing happens.")) + emagging = FALSE return if (prob(5)) var/mob/living/M = loc M.adjust_fire_stacks(1) M.IgniteMob() to_chat(user, span_danger("The card shorts out and catches fire in your hands!")) - log_combat(user, A, "attempted to emag") - if (!istype(A, /obj/machinery/computer/cargo)) - A.emag_act(user) + log_combat(user, target, "attempted to emag") + if (!istype(target, /obj/machinery/computer/cargo)) + target.emag_act(user) else to_chat(user, span_notice("The cheap circuitry isn't strong enough to subvert this!")) + emagging = FALSE /obj/item/card/emag/improvised/attackby(obj/item/W, mob/user, params) . = ..() @@ -112,11 +115,11 @@ var/obj/item/stack/sheet/mineral/uranium/T = W T.use(1) charges++ - to_chat(user, span_notice("You add another charge to the [src]. It now has [charges] uses remaining.")) + to_chat(user, span_notice("You add another charge to the [src]. It now has [charges] use[charges == 1 ? "" : "s"] remaining.")) /obj/item/card/emag/improvised/examine(mob/user) . = ..() - . += span_notice("The charge meter indicates that it has [charges] charges remaining out of [max_charges].") + . += span_notice("The charge meter indicates that it has [charges] charge[charges == 1 ? "" : "s"] remaining out of [max_charges] charges.") /obj/item/card/emag/attack() return diff --git a/yogstation/code/game/objects/items/cards_ids.dm b/yogstation/code/game/objects/items/cards_ids.dm index 4fd445edc3e4..5b3a8c575a46 100644 --- a/yogstation/code/game/objects/items/cards_ids.dm +++ b/yogstation/code/game/objects/items/cards_ids.dm @@ -72,7 +72,7 @@ var/otherEmag = user.get_active_held_item() if(!otherEmag) return - if(!can_bluespace) + if(istype(otherEmag, /obj/item/card/emag/improvised)) return if(prob(10)) to_chat(user, span_notice("By some ungodly miracle, the emag gains new functionality instead of being destroyed.")) From 3723740066abb32b004ba116f965596562405d91 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Wed, 3 Aug 2022 23:11:03 -0400 Subject: [PATCH 06/10] Update cards_ids.dm --- code/game/objects/items/cards_ids.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index b0b2c45d2a4b..54cdd124c8b8 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -97,7 +97,7 @@ emagging = FALSE return if (prob(5)) - var/mob/living/M = loc + var/mob/living/M = user M.adjust_fire_stacks(1) M.IgniteMob() to_chat(user, span_danger("The card shorts out and catches fire in your hands!")) From 25919fb22c01ec397cfcc5278ce45f8e4a321a45 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Wed, 3 Aug 2022 23:22:08 -0400 Subject: [PATCH 07/10] quick fix --- code/game/objects/items/cards_ids.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 54cdd124c8b8..9355f8d28d24 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -90,7 +90,7 @@ if(!proximity && prox_check) //left in for badmins return emagging = TRUE - if(do_after(user, rand(5, 10) SECONDS, src)) + if(do_after(user, rand(5, 10) SECONDS, target)) charges-- if (prob(40)) to_chat(user, span_notice("[src] emits a puff of smoke, but nothing happens.")) From 2562ec17a06f34b59390650766130cb7d154f587 Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Thu, 4 Aug 2022 13:56:56 -0400 Subject: [PATCH 08/10] animate ;) --- yogstation/icons/obj/card.dmi | Bin 10609 -> 10720 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/yogstation/icons/obj/card.dmi b/yogstation/icons/obj/card.dmi index 69138ff9b2a364fc030eabb8cc86235236552550..334936c983b0dc12767f00aba1c25bc22512f778 100644 GIT binary patch literal 10720 zcmb_?bySq!_wFFlEz+eZD3VHd2qL0@bcY~Acf&A*(jnccbPO^G(%s!T#DH`S-E&_* z-`}nE``&fejX%yi?>g(OGw1AgpS_>`JSS8|NuCIw79Rux5h=WtRRw;R|2AA~;7QAA zwE_ZRNP4MjyU2caHg&ReaIv(v1A#o!6XN=@nY9e_pX@JNVUXEj|0|M)y}sR=2!hN=@bb ztx$-Ooup~2%t+gSNvoYOZ=@+r&euH4sDK!|4dn=fq(HTw9LZvng_pF#Zit>0ncUb! z)t|z}3o&ueXuhcF+~7=!%926k9*N@_3El7d5gS9VM_3166DGrZhRBvf>EylXk1v(j zh}qTotUHI&nQIiR~6uImwHRS&2%|X8_vr`yY{R7 z3Qs6u5Z?Yq+5H_XQbs_Rlwzrq4s!m{yiB)@JxTd zab*%_Wlo%SOFLCxb_r7UjF)Q2O!@`_Jpw7nN~?RM?`3%VJp5DZmxcFb`DHa@p2|m+ zhauV=)jtbJzZsl5kl9$4>EhN@2NY6>KiHL)Z9$gd8{(^~TQ&MKi_59o{Y-pn+_9~x z_K{Xfij+V)W~}P|+cQzlPujIJ2U~b%Ek!fUB4#1YwPMGDaf^Ee??b{ReJ&jM zeJ&1Hovv{Lr6~wmm(Jdlmj`T9FbX+50{!{(N9=fj_l;5j!*|;eRDr<=qhI}E$uVD3 zV)<*)W7OiX@!1XjFw%Mpn}m_DWqY#3bLA_Q*wUTvE?Ra>L%qZPddd!mQPize_1#N{ zWvO@X-hm3s%ipjaC`tL&NOxzsNqgUG#K$NsEjs6DGH6(A9M}+;@OVHQLIHC>STw&O zq7w^0*tl~Kt1;~+CT0}tnQp#2{nB5bh|wLzPy)gxqy`z6{m!qeOVudR{An?oo1Wo+ zV;2|&^@hPf+D8~Zl>`!VM#C97&FdUZysMU%d~{Y$X;>LF%KhNZrHaP|IwQlk2M?9| z?>ecB91fSIheUQb9!U^X3t`S_T{RF4tyZZi!)Zy0gYkmf`2+-1RaM)HHA-}8_mgb` z4aDkQQkC6O&^TTcGCik0!-E_(WUrwQTfi{VctV{UCqzTYYV72@8aU#yBjm4~1$TGX(VYn#yH6eOzP)(GBgiOnX* z+Sz8|^9AR!LQ}0R@@=2r4GFgRIoEs7V>6(WAflKK zs?xjW4d%8_-mzsiJYDMZ1-pcqwBX4bFPHGuMzeBB2Q_U1vSO}@`0<8HuSL=bD z=G#4c3^lQq*kR6egF)wJ#(MO06IujD2{Ze+!aRKrWkm{)>hMq#zTh;Oqj5Od9K~Nw zTdIAu|7#e1g9Tcuzw&;bC$u*)ZeeA`Oi%nhKDVeSw5#h4K0ZF+Uh997jMjngIdDPv zV?MhReylTim;Tq=<_`vbPn*lHU7dD*q>-Hc90rCGnp37%n}EAe$^?Ypi&@5*L2 z$nlbGDJPKPwT=vJX=!OK=BqjB1Z$AEh zq2+tN|4ZC6>mKQ@r-ITMRIwv)O{Zd(P{?ZH`Df}kGN@gg#>S7w8^Z;_V)4jXwIPRz z>8_;$`gYaQIZ`x!M?Z)}e3?;;L%9@%D6jd}ijY5WV?a zl_ltXnm}ZJJ}W)}K~Z_R`Q_0c4ud+rKQukF*nWaF4JOq&tYblj1-i2%djgvmAj*kOF$2@(SzG9!IhT+WvNAci#&2rs^){m(O`7qUfsPo*$DTU)vmdyg(VpczdGA z@&H=XiOEZFFWsq+%`XLO^;I?`Z+Od*ILJhs=}vi5?&4{=b8A~0M6*{Mu#V6V^foa zT?#v_;nio#n|`CawssOp`s2(LUU1jj^F{9i)R-c7C&aDtw%Il|MR?eAlS+T$NsE@` zCT<6~b&yVQe9szj@n_el%V+;&YkYhT?RM$(IP(_z_8SHc3FCY8-7SWN_YMqn;Wk6x z-k@>zTz>r~KGyD*18*ta zKr!Cx$9V3BxxArvV0_gH-<-c?E*6B3B8$~JpI?NSIZ38RtsX4)#@kX zM`mvaWE;#3hFb%1$O*AA9^m61-d!I!-(7BWo3)ZF3Hkpt?e5|b^gJ@#;oU_jJ+ho0 zZ$j53A+V*Q8-{#DeeNkEj+)btN4OuDOZzo^CAh?0J{iaOy`R7HY7t#ask}rGQIGq5 z{HF=EkHDGRPPU@#(ms`r&Snb^j;Z1Gx;s}k;15xZ;(g_H2D@{0{kmH$iitnyk7wr{ z5Mx=%NVd;+ys%o?d6kE@?FE899r?3*%MXpAj8ue|B9OXM{(1;@!|9Zs<*(L779G#? z>iGHP9|2QS9u>F8*BiHx2Z zvkw=0KPMS<&2D67pzhoQT{_3L<$K}764nun;<{V#=r>H-L?rr5$K#=m&^hp}fr^S$ zu)S}mmww}CaTdfCYV$Vw6ZM-pc82jF)@YF&4Sc`@N6lz6qVxwrvm>TX zf+9nrI3hCIUyBwSGGRfYm7hAps^+s-MeU1sY@yJ!czC|>lR}$H<9wtglB-Q!Lu2%O+WlyX z-yD6{PXMk2qZw83^Bx{EWk#D&KhN8o`Dq&Akvh_Ua1?c=Hnk*BSX}&RF(KM<6`eYb zD8L45zudFUrmB#P#sCw(8Pt0I+W#JApu5&ow)zK6TL7eid-lNH5x2X99$s`oCWn$S z-3GohDI(qAh2M5K?}|#1_Js-yM3YEi?(&(=@db49B~*Y0mYW-}*yuf8ZL8PvaCm5U z7H-P;tWG?~UefG1GO4)u#ns)qpxEgu(`)J>pXL4JTS@mJeNfQ7v^G(^Xu9sWsA26! zFW0GgN%BexWpa1APXHX)-jGBKdwP1lTw?sa8YRj@*nZ`{`h%{FD|=lT))1^3wvp*w zF2}xS)4mU>Z}qz*8H~1WPt#irS)k(U4zQ~-0p{ov_Qm|Y*30=4Wkly)?JE6-*YUQS zGfMI@D4W*J^2G5KYH07lUXYb8bEf&l;ffWIY!dxM&vro}^~J)#Q7xe>9@Y8DV#Kfb z3%$4CvookEs17$DOr^9(8}rQAP}&rEr2ZzPCJy#ojTGEO)C&SR=3K=Eebc2NsEd=$ zNYHd$e5scN&Vo!Oz$4*Az*k}#56W6RQad_2;vo!--M=ja{Bfk@pl&M2LFoPG4~?!b z*JGd6bad487j*{+HvSy{bwQej1wfZkQ)$7D@X%(Hz*FlW02`cWj}W2wde558Kh4To zqp32CWcRLr#U~|U?%SfxezRn6;5XGu&QllQagLfP|X8XV!j#_Z5N zFLmh3n=ier+czqSMDE^;bS*@A+;;!m%CF4N1WEvB@g_zBk@{Q(m{rsMzH-EgHt8p* zsu>lD@oHD(6!q|67B$N}TJUC=C=)0JOr>i&$DiK3NWHb1DAj?NZk*rRGU-Xow59S} z_w@JoZ^6PdY%g{;*7@D@;-A@87?It!E7x^4XzHj9m%5*?`_Nfb)@CfT@`8sVYFT2~ zQM(t7X#Uy<%5f(p7Qh~?dcHk=+5Ft_mlZ{jNtH)L64#l)&FOJ-Wusetf$einP7Pk} zUFzeKGtt-3Q;xeex`4jR5;yKnIticOl}qvGGGd~>2f$Y=blaW5_|2Wkx|Q_vl%^0U zD-zhXfC!=l9rWd>mhOfDM_^qv>#CBd#T$i0%KNtCEQS=IywR`sJH~(92#@u|JfT?b zmv%3$0*b7wrfepp^vRB;VHmjkU=P-uxnAv&nm!oDiYs&6)6o#H{De9C(M1UEb6g4L zd-ws-A%6dfE1f4FFQ!}gG1MmI;oNck92VSjInT~4ZTJczMwlb$g;oF5Nf_r|xfpg(-JM$e z^y4gxUdKMeY*ze8CE~g%>+37=jty`>u@aI^aHQ;tQCumOjgr`P{MpcXZ35PwX(^YS z0n%`KR#}+?%VG9&(#uaBxPQzcQr-}myoXu7XKW1fu4|+6Oux3t*O{9RVai?i%-I>A zmPaQN4TaN%u8De`6i!9~-n=taCJfY`W7WT&Ho+w_sQ4dXFzQ@=Yx7HkHFRbz^>Grb zgVf_Sv2R0+w8-^IMw+zbBqfp4T*OV7D(bq9Ce>LnXBs0eb*WyJ^w*}1HqO5)#~*7z zgg94#W4=6zOb~NNI%`6HYnJJDa_DJjOy*ws1!5EB&QE{Z2=)Af9!N=YHh4m|yh6pK zK6Dj=cAk7X{B#02i&B;0%w*tZ0bYAG+st{5U!Ve7AG!JO>9o|AvZiq)7fYnCpK&9G z{^UGvxVm_EEFK++Od-#dX6uZ3B5yIC|6%Oh{J|32Vt+G#xX)VM8|IeRitDlhJerUW zy>c#clvvvb6rTdGu``XbvQhbH*0?_9mzgVzBHE2ol4$_#pUv&P?B^KJ!)=M`+4U5( zqrNBAEt$&f>y3n!UHLU%baI27ZITrLlSj%90*D<0z;G4GuCDcOa>+SYI3@Wyy)Am_ z+3CC8|`XuiuLkz^#(ab{ka;i0th+9N0X`CHI z${I=hs3eE4@ixlIep}sGSJq0nSY|+(LbMCeuvC0HsbUh0%-aPmixC9XV^{y4=s6DpMu`J2Dsl_qdV;t)Z&T*T^Yx?N|DFRobXi9P~nCd-;8{2e>j zdpEjVH^;*am(Ku3Tm^`MmGoEJ&4|=C@4tC;zy4rdUUE)Rh`vZpf#E9?qOHGM3k&%%vXC3d_k4?F@XF4&} zBw*X){+>oEWM#}Y#wwbr^Mn@ib>C;*<;fR=-X>!0K{qNbzBWqeo0>jROu7pR=V}~& zF;Im5kSz3gzgpJQQ+UPUcjqa_c$soxP27-&-9$nE7x_eqAG@byjSbBBv8R>2UT$N3 zerKgMHnXp$c{9nukl*J^2ZXyFJib`6+~t0kM9F)<<_$R25)>dZ?L1;-${TCzC3Y|W z#<03eD`-swzDK(mYrMO_J6od+F{R)z!pjb`S6QG)ylr1>2U+T|VQp88knVot|{YS{{>^N7E zsrR5IQ|Sqcc$FQJq~B1Nn*9Lp>-%0IOp*EwH@3!aqqBQeid$bJbb*0q({eJ8$tyEs z+pK|f?9GuGC%Y=y8z7T!=1TUa()frYnE=l^@GE|HVeTSTZSW9HHji=Vk7=J!BkC0D z(#3+%R(ygds2xP~!8`1U9uFQtB!xU<@LSHD`CKcM*TOiF-v_mt%1^4EW5bMB%TicB z^jXQPJkCy)S^gOj_Jj!ctEyshWTDOyPF24qU%}mj>s48&x=4fS+^{gmv+mF}7rJ_z zJ#P)_zwZO_bH+I@SiKJOa(T21t@`mbbO{Q2M{sZofjabiH^M-gjd{}O!K+%tsnw<$ zx=e^A-NT>bIU)AAAzF&35Whd5yc}v`qC!C>|3{HVl2qMa2Hu#0+^+hfglb@<6X`tm zve{h6qTzfbOAsf*t7pse!oU%C+h8}B7-F2geHZSWt?<)xTL3V^+RT8!NvnUNi#V&h z=^41$iL;54Gg>V1}#egZ!|DoX6V&xz?0*JqTIc*; za1no`$0vKim7iNVmR&e@dRQls&I_MR?3@ZN;V$C|(~q_@mk1fQ!6Bwsfi+#d7#2UL zR~AFvPe|A|^L+-k+ae)Nx}^n-W*}N^j^i+;b*!`G7BhOr;cl9Rm>uvT&6;IQW>ojL zZ)Ngl4{jOKr09Y|x)B$Cu9~jq)lxbsDNmWfi+y9l*v_x6H>>Khd+Xxu+=Vmvrt@6t z`?r47a^=k%C_Ni={m0Ws4MxlmN;UQAN~t@lb%;MMWBN(2(zpu9i=v(aIKJlb{r|_{ z`QL?`|5el-OQqtYX*G7KJ4_$MOMT({NW=gl7q#B;o?)r_E@2S{ZJ}%)3%)qp+EyD( z&S1Y+y$Tx(UgcKNql+|BkJq> z9G)fB(1*`!-W(M3BF#{$i~QIMZx1g0Ci&B8U1;Q;%!o8k3tJqrtcnu z%!Jm2x6^})aB!oAY>i?$?tNys^n6EnQ?Zl8Lx-WMvUyBn(!NWTN2C#@%^$>WbxWj; zSjOX|x(r5Skt}g9sh&Oz9wNSc&!WCgob#1&2+T)=jcb=aXq2?S8ElA({sA zB4(r>r5hoEliU%9&E19;r2zB1WE@Ajt8Iw-sx7(R)_`HCk;M21dNT>)p`sFt`wJ&aEf6naf#s*@kt$`sa`PpC_JS6nOX>t9Ux< z=x5zeM`Br7Cr~}Z1S>z9D_<}o4ZO(oJN3~iD^6aOyP3)KYc$x(B-Ag9T65K!P{^+4 z$j`MahlO=^PVb5fjieycU)PZoH4nJ%y~lCyfeXjT*B zE)VMNa1S|GdJehNOUH-~E!~LoAdMM*hI+)DrHu4v%QE`cLt3_pqhtK{7}lxPKoVaQ zj-bC98SecACL^qIGjH-4&Ia0J*2sg=WI-BEn&Wq0^#MimlK;#9rd#p$!B0G;auLwaOO3v4OKF$0{h-pa*HNnbZFfEA8b?FyJ6*tKl#N;dFQYVxw4?XF#L9%B6V`y_@cx_R)Y8hww)e(yV=f|&oC@TdxeSTzglGy z%sub}zrIk9u(ayQxB!B?#!3F{XG{zYdi;<2^vn<6)l3%ATrGnpR~PNF<1dFFZGlXk z>USppML0K$)>IP^1QrV+ZkcdjG$MErH=K1O$#2Dux#f7I=H&3JPd*i_mv=kl%Qu?arn14s%8w10>&?qaqqi@gkqO&}Zc*DG_fZF!3g?CtN zRZ&x7ah0IASGNV4-XOnsG`i-_ygm-ZA1E&{Xh77v!@bY#v}n`Vu3G4X9I{Vm z`U4L=qPh8^cWNGYMKi%-L;p_g9gFo>vyWFLq!;=Y8~XrMTvGC}FU{}}#c1?4>&v}F z`V26L8vHPgcadKIjp?1>pkTTKE6D2nf!##~FDN>*I_0H7IHJbZ&VYGvu)$C%M^gglQ~x4B{oPO98mCbVaV(r|bL(1b%S)mv)n#%YLr< z2(l+{3OBN#O`XsDR>hk}oRIf-=T|;_4xK*10daA%g9I=S=Va&G$Xa)+F7FzBE;%mr zSm+I{B&I!bXT=$oOc<4S8-I4{jCeZc032QQ!J=JbId9A8clnR+$cTe25q12*Buv;A zDD6$abxU;u%g=iX zf!6{n*T*$x@Bv|AVNK0!ZkNC`xtlINz4>Rg%Myux5YdJrP?T>|sOAS-kcul5b2(ua z<4WInv7b%~YM7=iFGSzP^Xc5Eb*&jRf*!cLvC}b9|DiXRA9?AyGGzp>`(6P4h9w_K zn@89lB6^s<0N+>gT5u)?O)E2W-!O^!tA;(1kJ7g72?EUXO;o=T*ZH!$z^MZ2Q^QBL zW!C!f`x`btKsOr)RBJwd{-2EkbCY!*D?6Z426xMWYk?29J$;~eMZW`;jmR3di%TZP z@)YATK~cdM$r@DmvqH!#viCyy?p7@ZoY4!_p{}sVRUH4%6Sjo`p&L$XJ!Es$wggfa z2iKsP(PO@$;w!(UMmNWS>$KEVkdW8O^D7mPwHW!giMP8rnfto@{QRRuub=&8N`X3@ zirXhcl^JKXZCXckU-eBDQ~R-6R*vu0rPy`OrK+#5@4^O?7&Xl*ZD@2Ou(@Rh$9n<- zjIExk@2kjG?vgNOepyr1H`y?9c#^R_eqk&vjj{dhQlI&97sn8w0%qV) z5@SR4it%PBG$j3&YW(Zb&)ZSXbgxlD5hxTxG)cS-&a_C_lJhzkH@H3B0~ty$Y2DWXGKnJja9Tb zv4MKb-Jpv?>F~bF=sUWDp9>lt+}w(k*IOo?3jdX?ii^Xv3_Y>@%%~nk)m$6}>O(`x zD_l!_Xe}ck<*wGL^!*eMA8JGAjmBrk?$VofAs2@xss{KY2F&d|rRVAH7KAw}FUb`% z*Iy4{I!rGbxE#!8{8~Ng#Tjb&#KeRyr{;n0XG;f`meY|sFLUZtKDBJ#(T6ljYZCav-sacGnTnvkAUw&S(M>r7;X#^nWOG|2suyB+S5f|*bEp!g;^R- z!LC`_!V^(N++fOoXUan5^#HJl5Jvlo#Xc=hjW`IVEI8b?*KED01Jm=MU2#Z8XKHlc z-CpB~&(Zk>I5I59Pu)QFmn@yflAd483T`cJkxvbYVfg*MzGKN>449({a;*!#vn6uS zSo*ZDW8EZSJ6DxVfP03i4EH*5h`Xq1u zahr#3Q!uEPm_JirFBZbjnV!Xk~H0uuI%9Yy)%XNna*!lH2v|}D#k5TYyIciYKo0xk+aW(XrGcpA8rfYT=1+vAW3Es>F ziV1^fh{oTsP|W->?~YtiQ4vPAMv3#P1dpU-)?MSLX6r)UT*t%qD%xKbqs#y&HbF~( zF(v)m`haVvR-eJ6+uNsAbgT{+epRhzamut;+U-i9yt)Z>sbOpuDDfWH3td_oWt?0$ zD=g`+GYK+L(a?|s!Z@J7RW=RduKU-R57GikhLhVe!vPA*zT#|K&(>Z5bY+uO^87;i zxcBT9WT8>Rc=z3CfKFLx<^GPU=KyE0z_T>yM43FK_r@|-{J8Nl0n3tsM})xda;53UW%a0<6|?dWRlU=ISpG7=MdKj8C|$)N;I9>v>nC^8N8 z+y4F-FSkz`{En0Hjua8PCl+?BYR#SQ;keho%1f^BHyLsRN`J-feB|AdG}r8rP9pbes#p`fODx|c z9gK-rvTUP{%5q_Kq2WP=LkogR46+6UJTHydWb0F6vpN$S)hfdoz-bzUZWA_A3TcN^ zt8vP5*P9^)A80t`B^-wyE$w>w*w8C8B8FPe7Exz+9y)_(l$Q@F0(Xm9(ne#6V#;IJ z?7j!sce5m)`@@LSeJL*Or~PgqremwDgbzJIAZC!F>M29w)%a(rQ4|0s{A5c2`=*H8+WdAguVzK zi*`*~cs?EhK{+Kghl+B*R@QC|T2Mm5yJyGB{pR-hh2KT@&cJ}Tl~uOqU@BS?apx8R zB|$4aNuzxL^Mwe@4U(YH&jCRTj~?eR!xRPx9|~GUJ^cX(1eLx%@kk%dnOY z3jL?!`H@uukTN77#=YgHH+>!VNlZqEhZUGR+sequzA{H}$@;Y9WOHI!h}7$E@78Fk z^DV)n-T6W5f=r@zXsb3<`utV4+kjq%>xH5={;x&8MaPtt6|3LBf9uvcTiUcS#MzZa zK$BH*!?$t%CfSc~)iXj~f#+-T2AROr4TjcCx<^Il*lo<=&TM)#gG49y=-8O7wKYev zHr!dVIk`(J6{dQ1hC;IT1?fShy|3$avW@u>Zab5ybuO#9UogKp5l{7|9esLTY?C`!mr9t4 zL9b7iv*1<-Z!T;UBfb|F_C)T!qp6BWUOS1Ik-8huH7&JshE>x6D`XN14g{RNJnoO^ zzv@qgW?2)8kOk*QBm=XUvO(n6)up~+x5y0B|M3319sB8=NNa$g_eu@m4v2F%!iAKh z@&;@;D($Tjc9QUu_K`%svJh3Za5K#=t&UvwbhYGJ4UNNgI#zFpyb7jY)}JoY)p&J2 zf6d6(fzNe1^9wx=#?hB|UH?2bUe1rd$Hk?;c7`341+$5ho?ZIoKYcBMAI&JKkLR=L zz1rS%v~D7Wzi>188kA4X#^8VV>zmJxqLJ$1Z`fsBTm-kLYYM8XlW2`$fvZ{GJWGPH z_Q5oR18i>IE^|Z-{;Jm+OUCK<;x=nmX;HS z&sKY4TCMjc;<%kkO?Qw%)DaZWu-i-@pv>Du-LerfwQTd@L+;Da+a(4y(W}}1SwMpn zUrNFD7HU!M_k73#kjI2#Vps4x6!Fkj8bMPzxlaOQEMH+q6irQUaVz~S)Fe*hS~_~Z zdlMOMCBlZb)i1tE-w*h$Oz(Oji09$w6~;yd`^n?Mj->dwYA< zhqndYHZ(!sRWp^?sdIn)_&hbGpTup@8UIvSJu5K74g@nF-L#_Lcx<=k(wIm-Yabjf zwQXS1hAQ|BtU2UuVSLBIP%DoW+JaZe-l1Y|1Dl!S2GYDG$aRnx=*ChwyhPUs)y?hT zlOo`kJ5AiNV*mNhV6-F^Bh~$+(kR0du}TBiI@b!*T>d#UG@HETV0{#?cDs7IgsavQ zx013`FyJR>)dw=&|I-7qhPKLf`QzsMc1md+ET)+ZdXKke6Vi}`pp#)w7Wk5s-INgM z`|H&BBdmu3n6Hw##i@(oW{Msk5B`+MS)?)4lrCgEKo+wN*uy0?YwuDSNzo!t&V(Jh zr1<*f7av*it{olG`SEVemFlYsVd)YWNn(PqXvb*A2%+Ephep`34_zl8nI9S=Ol5r1 z(C>uZHX5{#tyaOhsO36(zi86xY+bh()e zhU>jmSGCVEmf{@-=`J^zB0BE2LN}!N3@d~vRm>z*+a&2Vj`od_#JvzY7jv4EcCfXL zG*}r?=2b~0yuLa{;#%-2+8d#rk@xvWn$C9`z}FWzr%hG&i<;L$f~)tBufuU(rzcbA znSm!ynLE&BC`%RQw~+rg}LEN4#~W<81!{0!F|W>*hge^e4v2aB9}w~yC3`c z`_dCBoZcS|0#7|3Ka@r6acxPVd|g4!H^`-9?D3Q>+fm@_n_B^8iDPL)Pqe=#-H>keGCUR5fNg`u%A;x$K@fLzTK_RHfn0>Z?i-V zKKkG$3hkNlPhV>?R1rIN=(0L7R?-``Mva+p5L^2BLLyW49h{e&5lc;T9gF3K=DziY zNcvszhV0bO$t9a&7TuH=ep1phczAQ(yOINt^Q{yv*w|Zne)p}(lx0?xGz)m!+%`eH zyX1D4zs+(#=-}DfZ;xN{*psO1F2F?3%xDPMb;|-MK&p`Y0mTTU_|j6g4fdd^r8a_3 zoPj>1mCf9t9O4?bhQfh4Nw>ZI{rha@&*sFw9Ig#6wuPdH%YqrwJ#^`tU|7r-bBH&6 zsqwys1~|XZf8}}dd;0J^yOWbCib*~js)skXxEC_M&gVG9_*vBq28hi22*QOY8=i3P zOvXDiJsfR@KWE%J=wqDY5;biSF1Ri{*kF{bL3h|#GkuFlqQrF2Lxy~e5~5+Lxlai& z?dekf&2Bb87-8qeG9R5F?n|Z_6B@x$!0jNb&|u)*)0v*2YyDV2QbuJVU4;cYFLZ=I z*0>DI(K?-_7C?P2W|@t!LK6jl3JbCXUd1rN576>?Qo1U~##Fe`uvve!`Q>c0uea*O z1o6bul!^@pumVDNJa4t}jm)j32!AA#VZX&Gtct!t^jh+|I%V19^!@XPv>|#!HtH1O zgOd2-FLgf^&ekR&K1o#iobFcv+(g2mXw#SPAZZl7s=9uIbBC`X&VaO!3(Y4`Pa$k; z|9x>@<+Z;JbP5aYC#74z`0zDPEJTex>wB#P7#rHx?tO%YMgh!24l=9(l1rLG$f`;%Sm#YClo=ZTp*(g|-)QVJit)Sx{&xJ=4S z@tR2L_eG~q`8&Wzqqq`O^~LN~lZEpIeqewZUC3`%QmbcKtUHfitEiA)`gzkk7@HmK zA}dUZ8jf~uTKg z>(p2{EUk8$GEY868+ozJ%fZh6`Shp-UNaYNMmK@nWHpAm;XU{F#2S532VWkH!l&Lt z>D_nG#6*1!{>Fy%bCU;Nf0}c|Xk7Ei|MoF}rEejOu?r8o-k%(WlM18}+eq2ET_~c? z#`j3`ViLkUtZLqiXpTO>3bDM3d;>sD8Np1o4ZZY?R=;8btKRIJsDW_!X^~#hlEZ39 zx_w#w*R=6sof@y}^UEumN>iJT(RRxgN724b1X2|+K!};{@f+9ci~2B>9+R{rjnC>+ zTn&$!>noeAoBSgdLJK zVh9obz700mN5Z76ch&N`g6u!jQu)t{Z=%S;+DF&QbLcVF@eKa`AAb{1V0j@8DQCwU zg+)a-W~Q%u9F@T;83ClUJVL*Fd+$llH~Yd@*)&zluC$fPfw*gvH+vOlULkDg()N5J zde9P}B==pT>lm;bYVSr>{)RT>^n#a$il!%aAU zR=O0wlKTbX^7N;t*i~3(kbOjf;)#~f`S_1iL8$)V?&&I{a1$~NFqg)gH?gB8v=Y;M zF>3ubJ4%I(Rjqz<2WnE=cX0Z^V1o1LOq_2{&x(6cdS41Z%Sw`LX?x|;Ar|#V39K@L z$W2U6F8=y5wDTet2JnBnkl_t}H9y zATp321`A++-|JEO{wd{PG^%TU_qZ5HG4OVPxt>|t`VtiZDMd&4J-U#%QIkrhFuNga z@#ce6>`_mbao6PE8Qg?}x+At#Rs1L%k2eey!r82wrP3^*6uf zsmy75ADT5;P>0SCkcr^?Fvgy^c@_}1F}lpsymy*6exte?l14u%but^?FudH(Lrp`I z`z1FghuPr}uc;)C-3QX6-;&f`sb;1ue_usPIS!jKF%t=q!h1OcWEx>rAOPl4m_QsQ&E-TB1C)_(=LUR82nJXkL#iYQKsO)g3Jx;Q(P%uU9jvY}gIKt_OKhvJynF?%8RfD3kDpd7 z=7vOlRSr@A*haq)Y186lFyOlmR?!@+54lDfiuUyNVSjz z?e|)mpy7pu)^z$NxS-N7PER9AWAGOSP-pztC>;ExR}GT79(U#lIzQUBDTm}VK{Aun zfN%)@{QHM__4ilr#Aj+?NdkN+CwYp)Ty!r;)0Cf()+ZB^hw3`HV5TjD-*+k>Ww53b zt8hMh_N56jlXBCo2XPlPcRQ^^Kd2=SN+?!fn{hbj(R_K^dxwuxc-^k{%&SsbA(^Vd zaiIlo&TA9?#j+>^duUO%o*NOe*7tpr%6;d()j|>m8e}BSNwx9<5*2xK_C7^5><(+9 zkG|;nJUmr#5<C`5CRWP*bmzb%d&Zks>d##pu&$OCq1Nyr86#M9WkOa(Mdj5Y z-e{ffyTN^ZaK9TB0{?N1Oyta1K?7DkvGZ~;^{#58k9watRLTWW^w3j7)spOs&UwOY z$R6)Lp)+d1AdM1?jtixBb{i?GW3QxGBjRY));8OVt|Z# z7D$3FPP!V1Ls@>_Qewngh`zJ3RTZ3l$xWEft=6DhK(WO$h*X!UiXONi#KGtbKoB3RZd$c3or?M zAl}BHO=yAty1kUbeIjUSr3Nu#ib7WjTSD|0OuhjlM`d+O+8#-N z!s}&g-cr2C?QS=XVpJj1)}#)bU-R?P5y*Mf8C-V<@nm0A;REq3jaCF|bASOJWjOdac-`g#b1u8~UoXdhA3!5JpRO!u1GOgPudmuZN{0K3&mx)np!vo7q8 z{`;&)U15J*=^Jb_&j`rQmt>u-l$wwViIkUn`MKRD-!?cSH1$afddkj;ii|xDb5IPk zFE}2Lo7@#BTzdXta%o=cA+2hoG!6CXrL_Zca92kz(NCua`J)@5q?Eg#AGwR;G>Jpc zy>@cbmnndqGSZ88^d3(R^^*$dOMj+eb+fAW^4F}7XBMiTlw)w;Wgf@rK&2JRoqp5s znVx=|>=WKL*O)TDzaumC@Z>t zlC6!ShFiY;T?&CSev}pR-@nrmP{f(My!BtI)Bi8>^KXCpTf_d}T@{}ckie#<4K#bV zj%-^j>ii3GZdLE%ObJ4$9$$MiF=bzk)=Ru{Lb%gsu<~{&5_ z`T22vS7)g+D$iqguEYchnVl>|>FsJH!MM3MafR`wvGMWDtvM2Mm<`Un3#TWn-NhT9d026R<8;keaPrK2H*I44Z`b*o99%&~1 zskaTP)2~%`(|pjSkC11VBzwN}Mf1*28#y%6y5?)xE4C6_SW-I_i)Gz_yoWLy&8n7F z;&r^!U+c7_3uLo_hKZEXwqFD*Pd9ywzCBS;`1p>6A6tR_0}y5MW!eYcx3dy8mh_HO zC=$JCv#-O8LLTPXbK`wJ!0}^%ZP|g!p}&rV@s|9XSM7aT#EZoR(-9RTukXeQ zI=G$M2BTBq;&7h#6+HRVMyhPwZvW}n>+Z>;ihyU=G-Rl{(hBL-jBfK3BqY^;vG)+m ztQyPj``)`QTf{;f6xwZf>%|`Boi~(VSpsSTiaU6OtuJMz|Nowfty&>e37Kcg^=F!bR;wi0+c=%=*405B6Q(E=!wjv9 z5`wCTRYG^{P&z|5^kVHOIp^BdUuMB#vIA#|GjF#MJh53}I-S0t!^#w^4w#rS%(F7; ztn1|oX2gleyt)CTn@|X#6FFxRQiajpN=Zd@n;;(GqccB^#4z#BZ7HlAp8G1*Jk@zZ z%^QDu0m=UD#>*TB8y~M^!CpQ?H33D|^}bD<*0b59j1DzsW4D$_G}8LZ@9(s+*!D(! zAp9SpTzI}p3D8%ofG_oX+Rz?^Bl!Z(cL73a;+@VM71-IBL9m6<<9#rE8PDm{+-*A~ zjLk(9Wl#`iRJv^*f#?WaAk=%OEYl8DYRCzzJyiF>lUOHOp*UENMIT{Ud!<13C0QcN z-7u){+NE6G{1pLaouVmwCfQN>iE)+6AF$tJYzajZ?{PL#7NckP7b?9ZJ z4qf>Gl>Mj+zPib&<>s_wImU)p0D~Y+mX|7OA;h8`xN%gmPX<|rWZ?S-Xa5&u81EYs zxWvO}d=gApbMG5R?)lyVjz7iKn;UXfeGU`(@4317YH{&2&s~M~7X_Y*61TV4)MIo~ zvAD+T!=ao%W;iE^H-TyR%{}*TStbzG8~j)|#DZa^eA0koj+O`p-jd}ZZ{E?{HC~o- zavNJKkb*bz$uY%?{8$D|6T@qhD{W{C%i~SYCycUxa0=kh z-K%jh)8DI!|2j~{@seVNN?l*zp06lBkfIO?)L6uwCeoS^j#_wAO>*x)Ur~7=rDi^7 zQDxP~dCwVGOMg(5{~>7p@4(={0hW;>YhtPiXg7mJAZ9Hq~ zuqBGRI64!`na3=6RN=I#w+B`cnqs`+@d{vrKpNhH?^GXcyJ7k=P)P!#Y&_|*E zAu9U!iNUFK+LZb)JB@~9F;9z9lQ;pd`x!QaDxe||>G|+(&O%FOnrx0Z7PpRGsw@+e zY_7B|x4}MRnU;`1c4!M7#ywN$@Z^%R>M~&}l+nyU?wh!W^fUed5WGEEGR#EN!ms%O z{p__NR8r90)_U&ZGn7rM$r1HVww*=&EYS2{Oa@Attu9j|H;!4Kq6f$8|MT^*zVarB z{=2Q!X?xMPO-A>5X2NfV02slZ#^F}!t7syL6{n^BY%^hgq$1*RuQ4%rB<;uBjZ3*_{d?4>5t?NLqhmP|*vmsm@tR6R z@0m~06S{9esOL+uFV+y;Y7Q(y8A(cW;Idzg;B|hBM*SeK6mE5DG4`;xqrG>krC8rJ zzpCSfgw~%MxH0j?!B$L2kTF#e)KT9VS0 z`Ka4k(E|qPa54jVscf{CsQD!%Y*TD-?nL)#YyJ^Yi+_>xq=7LeQ+XU+7!D*rnCXge08bd78?8t_{QpoBta&mv{56wpw;(w8FWC-Q|06@NJnRH$~ zUN}B)vJcubiM04ntZ7f=SwqIm<|j>Xg?pA_=&6=_hl7T0c=iM=b;alaEtxohp!G$u zz{20FK)_{6DcCC4;~AHj!;@iorhad$zxxGl!1jCCo^q1PQ|pnQ?3#NNZfDyQ<^0*a zZW{$`8i+ouil}i}RdwH)SywU_l#38~Kg7IQuE73KvDT0N-Ngy^St<hFMEb!f%AM`1Lm+&g`gYgIW?(i%M?+=&?(A2f@$R3Ku;^7m4hGu4L?KNcE-{!q4 z{6y*^;a$W0O?l3tef2TvRL7?FOcW2B``5BE%6w`kFf&_DzyP?IZnTh-ol z%fzE#f&dD)qv-4DYCAF59&;U|`ms`?x`IXNNW?>d2qJ-U-s;o6j?1fB#tnun5J zRX6CsFvmWe!Dh_}yp|s1QCdeHFmG57YKf=F@jXA9nB3d%<<%LKJkGFq(W=3Pcb<6? zazpfDooMRg6kg7QE8>=jN}mJCuEu1MSiDB?*FZpIH*5Fvn^rrM0O6}Lv@j(fy_BoZ z-=0d{B(1ruA7_vh3+B>&`}QkY+h?l5o=hA2JX9tW?$OY6!u_wWy6I4q#{>>x zy#f9Gp^mJdWSKBQK{wLU(m?NZPVRvKVXrkBk@D-F>^A}&e~LMuTZ<1*oX=4t3P|(a zw`U1cXtlQfikXkm4tHjMJdgm*{^D3wDcGb~t@K?F1|QbYgG3z{K!5^}7XwKH-dwrg zrI#^m@ssAc9Ob^uE2AMP&1=dB6Rf^XX03`JW7fxuh{*2?wEuS2Z>+o>X{NfZ%hSj= zHC_UAoyB+U@AJzmsFgW+X82xFAFAQ1EU*|cZw6m&3B(^88{5M~@ZQMbZRw_PCgcsH zDzi(MNwbdjEwwX{iCzYhBZo^ne-)_mxyxC_HBe1ebmNfqASQ1sn{$~6u9IPW{HG@K()z&g6XQ9fUk0Ap*0v@oGTp(i=gFA@+)v`ca&98#ExmG z-Ty1dh~sbciG1B6t`=&Iz8sFM208(1H6_PcUOkMP&CI4oC3?+1Vj*UqVZZJuW&|uc z3VD!cm>a+LbW2N(68D{Nteh)bcmnLxna@PG%r$uvLo`XG&z;zQIoX|}GW>^kQg}zN zXy@NaC&$3-I^TjWR;8{Li{Czf{`_DQHTc`dAZ?+-@9E5G+UeO?p@un6&Sb}EiT+QL zeCquu+C>FcRp~bNmbt*0Mo&S<+{0S6Y=|^|C#8=V@kvAlyq>IuU zMC)9W2oovsgNCg76)O^?es?Bf+jKA4VezJ*TKS*9r6~TIr=Wk;qW-E?kFy-x6Dmm0 z_CFFW^txWmKRY{Ef7wQw{Gv^tXkfj4u8C=HqJ*&pOV;SdG87g}>OSgoQ2tQTnF;^Q zr?Zui9Q09?C-2p#HZx=YOE)EDWuR1)?$Dgtuu~tw^jeJYuU0&zUv1zdQa$1Dvp#R% zTWS&a@u?{;)SswD)ci?jU{T7az7pE}($d=j!gd3Z24-evkMPgh{ZQ&qS@Y}pkq=|P zK9NT4?>pOY-O|0gGuhPUrP@vf+5P5r$7;O4Yj{PO0p3MUs*2f5_R^0r$wCXR9JO=S zxXb*Mpn341!al`}4sftH+S;9cse=%i|<1f(~SDHXmm#tiec!@=V`UQzoN5r6$;SXA|LhS7lQa^)OT z-K4sKL2vjyPChdH)8`F)a+uHc6l)fXzdm*T6>?f~i%5g8B}@RVY_L*1Z<@QDaxtJmdcn0{U2S}4nhC` From 4d12c787375fe882060b0a207d907531d7121e8d Mon Sep 17 00:00:00 2001 From: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com> Date: Sun, 7 Aug 2022 14:17:24 -0400 Subject: [PATCH 09/10] Orca sprites --- yogstation/icons/obj/card.dmi | Bin 10720 -> 10994 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/yogstation/icons/obj/card.dmi b/yogstation/icons/obj/card.dmi index 334936c983b0dc12767f00aba1c25bc22512f778..050d9d43fdcf260d1010b4be0ee4e23033f11978 100644 GIT binary patch literal 10994 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 Date: Sun, 7 Aug 2022 14:59:50 -0400 Subject: [PATCH 10/10] sussy merge conflicts --- code/datums/components/crafting/makeshift.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/components/crafting/makeshift.dm b/code/datums/components/crafting/makeshift.dm index e5f304bcac39..1be42fbd6478 100644 --- a/code/datums/components/crafting/makeshift.dm +++ b/code/datums/components/crafting/makeshift.dm @@ -98,7 +98,7 @@ result = /obj/item/card/emag/improvised time = 12 SECONDS category = CAT_TOOLS - always_availible = FALSE + always_available = FALSE /datum/crafting_recipe/makeshiftid name = "Makeshift ID"