From b2e0bfca73d37cc65e8c233af2198003896b1c53 Mon Sep 17 00:00:00 2001 From: Chubbygummibear Date: Thu, 25 Apr 2024 00:44:28 -0700 Subject: [PATCH 1/4] that's all --- code/modules/atmospherics/machinery/atmosmachinery.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index 63cf55779af0..62b353c94130 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -345,8 +345,6 @@ GLOBAL_LIST_EMPTY(pipeimages) add_atom_colour(obj_color, FIXED_COLOUR_PRIORITY) pipe_color = obj_color set_piping_layer(set_layer) - //var/turf/T = get_turf(src) - AddElement(/datum/element/undertile, TRAIT_T_RAY_VISIBLE) atmos_init() var/list/nodes = pipeline_expansion() for(var/obj/machinery/atmospherics/A in nodes) From e6c01e4d0089b2147849948af2cbb3e9daf460a7 Mon Sep 17 00:00:00 2001 From: Chubbygummibear Date: Thu, 25 Apr 2024 13:34:30 -0700 Subject: [PATCH 2/4] add the yog sprites to the main folder --- icons/mob/cameramob.dmi | Bin 1690 -> 2640 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/cameramob.dmi b/icons/mob/cameramob.dmi index 7ecaf0f6d968547b834ccb9eeb7c0e2261ed26ec..664b51d4521fbb6619979b441456afcdce73f5d5 100644 GIT binary patch literal 2640 zcma);c{Cf?9>=59HcV`-T8c7NZ`4w;RV22=UZiSQ`x0txF-k}tEm1`&wKgHDnX#2h zj8aQ^RV8+zs1imjvBwsQmwEra^Ul2Y{tJL4HYo001Cp zVGg^^j-~8{;pJxUPknu)*r74*j&l^u|AFuQpoplT@Gt-%w&dkd>yJt5VkxwDOF!Fq zX}yN?TyDOE^~Si#<;j#~x0g5y{<1kYH*cty*!5iPq5XTYiMQSFf2P6LX7tOt7d(<; z!BTN!u|0;ne>6i;sX#@cU~AJZ;5^r(=ru(7xyV3Jj#-8TuT`=OqC5wD72VtPT1%lm z4U_IBA8969f6w<#`2J){p#m#7rJ~F`GrWS}-w4N@8NNG@llw>*xbepF5P+2?eDW#0 zQVjs`Iat7q?!=a?m)t-~1IpovC?`l zkW(E$du%qsbXx<@oZ#Dcp>dl(9Vh5Z^BZBs&I5SQU|*1$B0$H1T!@tX-gL&JzP?3` z_Y=dFo0X{^B=N8lwbl9IPTB0P5PdTnMuFfV>KtPTW3#+>8yo9vd1o`#gDR zq;bN@K((kLsb5BKrDc5MHSiz!vjP=_Nd4yL4-W?M(3j0o2it!ziMB+_I${{_2E9D$ zG)>>uEcGAr@`SuYE59*9Pwp zN1BqRobY4rpZ?;|*D&|u)?TM&*p(Yc^AYer-$fQz)J^&7ly=DLwERN@bHnI1xQ0hf zpzE&hjSv+vos0^BQVmx<_yfQ7vf>yblHVON03g z&id+0Wj~TN#wyjoEpqZPKm7hoPtddYah@B-W3^?qEWddZeH6BOLq~O%wDUdwH+)Rh zxu$pLM;LLsV#Yg)&a$O@o-sa4r~59SdjaoRESoiW!A-~Dlf=-AxIUTYAO^j_;DV$gu0$YS~g-gnV@QW<~=gHB6C2DD1RWIrhM#{lM!)WG8c zfj;AR&rsLKGUncp?E8iClkaYsSr41@barMfj2GgAG?udK$4?_Uiv-P=7haAPGAS zd>GyNZ`pElIXd|p5;GbV4QviZb)KhcHz%S0s$!pqU~B}i`f>P8;MlqqAP&N11krZHk;+V2hx1Dh${L455rak!jmDQQ8g=_pW*I>#$^x zjNnjx%B*HmRu6Bw0~oSfrgC{iO06Mh$OfS@$+*tckbLpyM^=Ez1#B~isT zY^LDtsZ$$}7qh-rt9i%?C_xGZqKGJ%ToIL0XrqB2Ze%q>(ACr@!HuC(5#Zfjquoj> za)0X}fO^!Y>NJo`DmkB=lA&X0v&_Q&NfL_vvHvK#{{E|L2~{*$d1fNZ{+P1vJ>it^$%cwH zt=;#gv7T(C-R@0J*H`M$wugIvoH|1ZYz@nJk{`>lN+}QeHGgXB6 zHbyQV5;gj*poYx!rldcs**1UIMD9u}0Ge~riiCnrCD)^wDx5FcYq&B}wwE~oXElK> zz(az_9R9HOz67!)d_wSArO}j%SM>A%#5`2~D*i_dkqWfTE5+U40D~uSXIT}N#x3Vc z3+gxO>;MAHmGX#=B;(6iiMn%|lDGPqdxS8k6W)Z#@JTn>uUf=kg`c%S_rh1O8pc;2T?Ii=zomca@782)CHgBWHd@4-%yBM~(3_k+%~lU8kdi z%nYvXVzhhtrn@Ayy_LF<=o}p}yaX<^z2Y29@v{R0) zlv|6CRj{!uT8KvUV!PP?;U)hrj}dLJ^BvY2rk#4A;m)Ybvco=+OH;STI-_1{5a0{7 zWNK%Wh%o#?Zn4Gr3xFYR8sK)0;C@fMskZefYVkhllKWM$SA|34KG6-e;oqy}T=Ve( zoz>~o{ab@aC!nqGS33^9$D$9X$&S#cRZquA&2hSjNaDBN q)OrZGg6gY_kfL*1g66kF&UkD>j!_b?;iBv>BESM}1FJRmO8O_ZGz8=T literal 1690 zcma)7e>Bqz6#p9YtF}p!*wE9PPCX(&lSUd*ep3|r@s==)7NR}BQZc0;&+if@VzQ7Y z3u9s;o*%KT-i#F*QrH`@#k~3N{qfG}{c-O-pU=7Ho_p`-+;cPBU5`VQHI)GXfH*m# zJ*6>4YC($fQqLj~oTQ`;fm&z4BNMYqZ6(eZn`) ztd0&79JVX(sdGeTDV%(qD^v{%ZfI6=fd_eneTpxKs3QlRC0}3odw2$LFsfV6WdXX$ zwruQ+JpD?(Nk^JvY%P1D-We&2-zizG!Ol3e)P0XypIRk<;=rm$X7_S#=|@Q@h12ug z5_I^-G@G_+&5nj_F=Jt2LF+(2`t3L4?*3^ZnT5S?bI_A}^U|4P1&t^H59ac9){&ze z%@sVbcD;Mg{e2N7Up=z?99yNr;3?~=94&)znt%=IN*B~D2JnSffpKM@YSX)#&KFBdYlR4fR9pcOsUl#JvgBQ`-=sz}wc(=M+R$H%zdlZi zxHyB0H=cP(TerSg<6LMKGi>okzyRsM}Cv^ zeeoOhZjXGAW;Ewh=}RhY!nYf?3CAqYNc4>fQdSp9|NWK zlYO-Pw0j17$mu3(c$P}}5ma_Jci7?NjouvuOTBsNVs<~lY4z3bU>a#vYmyEUiXI1h zL@18TtNn{JloIM1*>LF3aOe&=tP(<3+T*H9Y6XMZdksOIl&@U2%%WT5m%r=C`cLQD+rcZL?fRI{$>RnHc#%Uwb*mk!wYo|G0JX< z6kkt^l_kF!H%t(-?>Q|{C8Sq6vKbf_KtLr{EroUP-(M%$5Pc!(pGRx0LbY4UdE)ED zKm6KBQ5b0PweJAq0e-zFFAxRg$~Us( zD7b55nL0~ehAD+5#PD6zf(Y6LVSDo4{X2;MHFyuI%Mg+tl9`K}6rAl!g7`4i`?Tny zosM)oI4h1cDZu1qMOB+c2voefx@cKX; zN5-&Z3qtQkF?PnIkSDi~S$&WF@ zJC4xnUG|~nZ5WUc*kQuDVi+cK@4L9G23n-;9uK1;wra_L0sjBR{KsKs1GI%H>TUNX zQnOElQkr!7QHLH}{o1f%8gQq<`BA|`Jew3Q3f!{d?2g0Q!rvMpYK{Ammv%v9KY-6e zhji+Jqy;ZXJ_im3(}F6rnVGU)CIgzL29iWzVhxtV9&FXk1LsSh4d7(&imtH>O8o~V Cf+>*z From adc4abc966f5d2344dfbe09e0242a29702653456 Mon Sep 17 00:00:00 2001 From: Chubbygummibear Date: Thu, 25 Apr 2024 15:15:04 -0700 Subject: [PATCH 3/4] all visible now --- code/modules/antagonists/abductor/machinery/camera.dm | 2 +- code/modules/mining/aux_base_camera.dm | 1 + code/modules/mob/living/silicon/ai/freelook/eye.dm | 5 +++++ code/modules/research/xenobiology/xenobio_camera.dm | 10 +++++++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/code/modules/antagonists/abductor/machinery/camera.dm b/code/modules/antagonists/abductor/machinery/camera.dm index 3f8e1a458662..b9369ead0b88 100644 --- a/code/modules/antagonists/abductor/machinery/camera.dm +++ b/code/modules/antagonists/abductor/machinery/camera.dm @@ -22,7 +22,7 @@ eyeobj.visible_icon = TRUE eyeobj.icon = 'icons/mob/cameramob.dmi' eyeobj.icon_state = "abductor_camera" - eyeobj.invisibility = INVISIBILITY_OBSERVER + eyeobj.SetInvisibility(INVISIBILITY_OBSERVER) /obj/machinery/computer/camera_advanced/abductor/GrantActions(mob/living/carbon/user) ..() diff --git a/code/modules/mining/aux_base_camera.dm b/code/modules/mining/aux_base_camera.dm index 46f4850e0a7a..5cf6aaee1eeb 100644 --- a/code/modules/mining/aux_base_camera.dm +++ b/code/modules/mining/aux_base_camera.dm @@ -79,6 +79,7 @@ return FALSE eyeobj = new /mob/camera/ai_eye/remote/base_construction(get_turf(spawn_spot)) eyeobj.origin = src + return TRUE /obj/machinery/computer/camera_advanced/base_construction/attackby(obj/item/W, mob/user, params) diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm index f7fade0fc34e..5b8cac913709 100644 --- a/code/modules/mob/living/silicon/ai/freelook/eye.dm +++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm @@ -25,6 +25,11 @@ update_appearance() update_ai_detect_hud() setLoc(loc, TRUE) + + //Yog: make all remote camera eyes visible to ghosts + //"It's probably fine." + //-Cowbot93 + SetInvisibility(INVISIBILITY_OBSERVER) /mob/camera/ai_eye/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) . = ..() diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 877da55cc1b7..972f2209c20e 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -12,10 +12,17 @@ /mob/camera/ai_eye/remote/xenobio/setLoc(turf/destination, force_update = FALSE) var/area/new_area = get_area(destination) + if(new_area && new_area.name == allowed_area || new_area && new_area.xenobiology_compatible) return ..() - else + +/mob/camera/ai_eye/remote/xenobio/can_z_move(direction, turf/start, turf/destination, z_move_flags = NONE, mob/living/rider) + . = ..() + if(!.) return + var/area/new_area = get_area(.) + if(new_area.name != allowed_area && !new_area.xenobiology_compatible) + return FALSE /obj/machinery/computer/camera_advanced/xenobio name = "Slime management console" @@ -67,6 +74,7 @@ return ..() /obj/machinery/computer/camera_advanced/xenobio/CreateEye() + . = ..() eyeobj = new /mob/camera/ai_eye/remote/xenobio(get_turf(src)) eyeobj.origin = src eyeobj.visible_icon = TRUE From b3a1d6978269a03695d356360d6f6e524ae159c3 Mon Sep 17 00:00:00 2001 From: Chubbygummibear Date: Thu, 25 Apr 2024 19:26:38 -0700 Subject: [PATCH 4/4] snowflake plating --- code/game/turfs/open/floor/plating/catwalk_plating.dm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/code/game/turfs/open/floor/plating/catwalk_plating.dm b/code/game/turfs/open/floor/plating/catwalk_plating.dm index 8f5ff3a1fa92..c6a1bdc62138 100644 --- a/code/game/turfs/open/floor/plating/catwalk_plating.dm +++ b/code/game/turfs/open/floor/plating/catwalk_plating.dm @@ -13,7 +13,6 @@ baseturfs = /turf/open/floor/plating floor_tile = /obj/item/stack/tile/catwalk_tile layer = CATWALK_LAYER - plane = FLOOR_PLANE footstep = FOOTSTEP_CATWALK overfloor_placed = TRUE underfloor_accessibility = UNDERFLOOR_VISIBLE @@ -27,7 +26,7 @@ var/mutable_appearance/plating_underlay = mutable_appearance(icon, "[catwalk_type]_below", TURF_LAYER) catwalk_underlays[catwalk_type] = plating_underlay underlays += catwalk_underlays[catwalk_type] - update_icon() + update_appearance() /turf/open/floor/catwalk_floor/examine(mob/user) . = ..() @@ -44,16 +43,16 @@ if(!covered) underfloor_accessibility = UNDERFLOOR_INTERACTABLE layer = TURF_LAYER - plane = FLOOR_PLANE icon_state = "[catwalk_type]_below" else underfloor_accessibility = UNDERFLOOR_VISIBLE layer = CATWALK_LAYER - plane = FLOOR_PLANE //for some reason these are black icon_state = "[catwalk_type]_above" + + levelupdate() user.balloon_alert(user, "[!covered ? "cover removed" : "cover added"]") tool.play_tool_sound(src) - update_icon() + update_appearance() /turf/open/floor/catwalk_floor/crowbar_act(mob/user, obj/item/crowbar) if(covered)