From 15cfa99edcf7bd148d591213a443ec57d132e794 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Thu, 28 May 2015 15:55:55 -0400 Subject: [PATCH 1/2] Adds chickenman and clown statues --- _maps/map_files/cyberiad/cyberiad.dmm | 13 +++++++------ code/game/structure/structure.dm | 17 +++++++++++++++++ icons/obj/decorations.dmi | Bin 5526 -> 7619 bytes 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 90ae96299d3..7613a856d58 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -1115,9 +1115,9 @@ "avw" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/detectives_office) "avx" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/structure/disposalpipe/segment,/turf/simulated/wall/r_wall,/area/security/detectives_office) "avy" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/floor/plating,/area/maintenance/fsmaint) -"avz" = (/obj/machinery/vending/chinese,/obj/machinery/alarm{pixel_y = 23},/turf/simulated/floor/wood,/area/crew_quarters/mrchangs) +"avz" = (/obj/machinery/alarm{pixel_y = 23},/obj/structure/chickenstatue,/turf/simulated/floor/wood,/area/crew_quarters/mrchangs) "avA" = (/obj/machinery/vending/chinese,/obj/machinery/light{dir = 1},/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/turf/simulated/floor/wood,/area/crew_quarters/mrchangs) -"avB" = (/obj/machinery/camera{c_tag = "Mr. Chang's"; dir = 2; network = list("SS13")},/obj/machinery/vending/chinese,/turf/simulated/floor/wood,/area/crew_quarters/mrchangs) +"avB" = (/obj/machinery/camera{c_tag = "Mr. Chang's"; dir = 2; network = list("SS13")},/obj/structure/chickenstatue,/turf/simulated/floor/wood,/area/crew_quarters/mrchangs) "avC" = (/obj/machinery/camera{c_tag = "Barber Shop"; dir = 2; network = list("SS13")},/obj/machinery/alarm{pixel_y = 23},/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor{dir = 2; icon_state = "barber"},/area/civilian/barber) "avD" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/machinery/status_display{layer = 4; pixel_x = 0; pixel_y = 32},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4; initialize_directions = 11; level = 1},/turf/simulated/floor{dir = 2; icon_state = "barber"},/area/civilian/barber) "avE" = (/obj/machinery/power/apc{cell_type = 5000; dir = 1; name = "Barber Shop APC"; pixel_y = 24},/obj/structure/stool/bed/chair/barber{dir = 4},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor{dir = 2; icon_state = "barber"},/area/civilian/barber) @@ -1191,8 +1191,8 @@ "awU" = (/obj/machinery/camera{c_tag = "Clown's Office"; dir = 4; network = list("SS13")},/turf/simulated/floor/wood,/area/clownoffice) "awV" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/wood,/area/clownoffice) "awW" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/wood,/area/clownoffice) -"awX" = (/obj/structure/rack,/obj/item/clothing/under/rank/clown,/obj/item/weapon/storage/backpack/clown,/obj/item/clothing/mask/gas/clown_hat,/obj/item/clothing/shoes/clown_shoes,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/wood,/area/clownoffice) -"awY" = (/obj/item/flag/clown,/obj/machinery/light,/turf/simulated/floor/wood,/area/clownoffice) +"awX" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/item/flag/clown,/turf/simulated/floor/wood,/area/clownoffice) +"awY" = (/obj/machinery/light,/obj/structure/clownstatue,/turf/simulated/floor/wood,/area/clownoffice) "awZ" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 8; name = "Fore Primary Hallway APC"; pixel_x = -24},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) "axa" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/light,/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) "axb" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) @@ -8067,6 +8067,7 @@ "cZg" = (/obj/structure/grille,/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/turf/simulated/floor/plating,/area/aisat/maintenance) "cZh" = (/turf/space,/area/shuttle/derelict/ship/station) "cZi" = (/obj/structure/table,/obj/item/weapon/airlock_electronics,/obj/item/weapon/airlock_electronics,/obj/item/stack/cable_coil,/obj/item/stack/cable_coil,/obj/item/stack/tape_roll,/obj/item/stack/tape_roll,/turf/simulated/floor,/area/engine/equipmentstorage) +"cZj" = (/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/wood,/area/clownoffice) "cZm" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/closet/secure_closet/research_reagents,/turf/simulated/floor,/area/toxins/misc_lab) "cZn" = (/obj/machinery/atmospherics/pipe/simple/heat_exchanging{dir = 9},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/bluegrid{icon_state = "dark"; name = "Server Walkway"; nitrogen = 250; oxygen = 0; temperature = 0},/area/toxins/server_coldroom) "cZo" = (/obj/machinery/atmospherics/unary/vent_scrubber{on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/machinery/alarm{dir = 1; hidden = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor{icon_state = "dark"},/area/toxins/server) @@ -8170,8 +8171,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoPaoPaoPaoPaoPaaaaaaaaaaaaaaaaaaaczaabarBarBarBarBarBaabatmaabarBarBarBarBarBaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoUauBaneauCasEarKauDauEauFauGarParQauHauIauJauKauIauLarXarPauMauNauOauNauNauOauNauPapmasRauQapmauRapmauSauTauUauVauWauWauXauYauZavaavaavaavbavcavdaveaveaveaaaasqaabaaaapCaqDapEaaaaaaapCaqDapEaaaaaaapCaqDapEaaaaaaaaaapCaqDapEaaaaaaamjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakhakhakhakhakhakhakhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoPaoPaoPaoPaoPaaaaaaaaaaaaaaaaaaaczaabasrassassassassastasuasvaswaswaswaswasxaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaavfavfavfavfavfavfaoUaoUavgaoUasEasEasEavhaviavjavkavkavlavkavlavkavkavmasJasJavnavoavpavqavoavpavqavravsavsavsavsavsapmavtavuavvavvavwavvavxavyavaavzavAavBavbavCavDavEavFavcaaaasqaabaaaapCaqDapEaaaaaaapCaqDapEaaaaaaapCaqDapEaaaaabaabapCaqDapEaabaabamjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakhakhakhakhakhakhakhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoPaoPaoPaoPaoPaaaaaaaaaaaaaaaaaaaczaabatlatlatlatlatlaabatmaabatlatlatlatlatlaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaavfavGavHavIavJavKavLavMavNavMavOavMavMavPavQavQavQavQavQavRavSavTavQavQavQavQavUavQavQavQavQavVavWavXavYavZawaawbawcapuawdaweawfawgawhawiawjawkavaawlawmawnavbawoawpawoawqavcaabasqaabaaaapCaqDapEaaaaaaapCaqDapEaaaaaaapCaqDapEaabaabaaaaabaoOaabaaaaaaamjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakhakhakhakhakhakhakhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoPaoPaoPaaaaaaaaaaaaaaaaaaaaaapBaaaaaaaaaaabaaaaaaaaaatmaaaaaaaaaaabaaaaaaaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaavfawrawsawtawuawuawvawwawxawyavVavVavVawzavVavVavVavVavVawAavVavVavVavVavVavVawBavVavVavVavVawCavVawDavVawEavVavVawFapuawGawHawIawJawfawKawjawLavaawMawNawOawPawQawRawSavFavcaabasqaabaaaapCaqDapEaaaaaaapCaqDapEaaaaaaapCaqDapEaaaaaaaaaaabasqaabaaaaaaawTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakhakhakhakhakhakhakhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaczaabarBarBarBarBarBaabatmaabarBarBarBarBarBaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaavfawUawVawWawXawYavfawZaxaaxbaxcaxdaxeaxfaxgaxaaxcaxcaxcaxhaxcaxcaxcaxcaxcaxcaxiaxjaxkaxkaxkaxlaxmaxnaxmaxoaxpaxmaxqapuaxraxraxraxraxraxrawjawkavaaxsawmaxtavbawoaxuawoawqavcarxaxvarAaaaaaaaoOaabaabaabaabaoOaabaabaabaabaoOaabaabaabaabaxwaxxarAaabaaaamjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakhakhakhakhakhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoPaoPaoPaaaaaaaaaaaaaaaaaaaaaapBaaaaaaaaaaabaaaaaaaaaatmaaaaaaaaaaabaaaaaaaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaavfawrawsawtawuawXawvawwawxawyavVavVavVawzavVavVavVavVavVawAavVavVavVavVavVavVawBavVavVavVavVawCavVawDavVawEavVavVawFapuawGawHawIawJawfawKawjawLavaawMawNawOawPawQawRawSavFavcaabasqaabaaaapCaqDapEaaaaaaapCaqDapEaaaaaaapCaqDapEaaaaaaaaaaabasqaabaaaaaaawTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakhakhakhakhakhakhakhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaczaabarBarBarBarBarBaabatmaabarBarBarBarBarBaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaavfawUawVawWcZjawYavfawZaxaaxbaxcaxdaxeaxfaxgaxaaxcaxcaxcaxhaxcaxcaxcaxcaxcaxcaxiaxjaxkaxkaxkaxlaxmaxnaxmaxoaxpaxmaxqapuaxraxraxraxraxraxrawjawkavaaxsawmaxtavbawoaxuawoawqavcarxaxvarAaaaaaaaoOaabaabaabaabaoOaabaabaabaabaoOaabaabaabaabaxwaxxarAaabaaaamjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakhakhakhakhakhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoMaxyaoMaaaaaaaaaaaaaaaaaaaaaaczaabasrassassassassastasuasvaswaswaswaswasxaaaaczaaaaaaaaaaaaaabaaaaaaaaaaaaavfavfavfavfavfavfavfaxzaxzaxAaxBaxCaxDaxEaxFaxGaxHaxIaxGaxJaxGaxKaxKaxKaxKaxKaxKaxLaxKaxKaxMaxNaxOaxPaxzaxQaxzaxRaxzaxzaqzanTanTanTanTanTaxSawkavaaxTawmaxUavbaxVawRawSavFavcasqaxWaxXaryaryaxvaryaryaryaryaxvaryaryaryaryaxvaryaryaryaxYaxZaxWasqaabaaaamjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabayaaybayaaaaaaaaaaaaaaaaaaaaaaaczaabatlatlatlatlatlaabaycaabatlatlatlatlatlaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxAaydayeayfaxEaygaxGayhayiayjaykaylaymaynayoaypayqayraysaytayuayvavVavWaywayxayyayzayzayzayzayzayAayzayzayzayzayBayCayDayEayFayGayHayIayJawoawqavcayKaxvayLaabaabaaaaabayMayNayNayNayNayNayOaabaaaaaaaaaaaaaabayPayQayLaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayRaySayTaaaayUayVayWaaaaabayXayYayXaaaaaaaaaaaaaaaaaaaaaaczaaaaabaabaabaabaabaaaayZaaaaaaaaaaaaaaaaaaaabaczaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazaazbazcazdaxEaygaxGazeazfazgaykazhaziazjazjazjazjazjaysazjazkavQavVavWaxzazlazmaznaznaznaznazoazpazqazqazqazqazqazqazrazsaztazuazvazwazxazyavcavcazzazzazzazzazzazzazzazAazBazBazBazBazBazAazCaaaaaaaaaaaaaabaabazDaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/code/game/structure/structure.dm b/code/game/structure/structure.dm index 6f4e799c97b..094ca2d5774 100644 --- a/code/game/structure/structure.dm +++ b/code/game/structure/structure.dm @@ -12,4 +12,21 @@ icon = 'icons/obj/decorations.dmi' icon_state = "kidanstatue" anchored = 1 + density = 1 + +/obj/structure/chickenstatue + name = "Bronze Chickenman Statue" + desc = "An antique and oriental-looking statue of a Chickenman made of bronze." + icon = 'icons/obj/decorations.dmi' + icon_state = "chickenstatue" + anchored = 1 + density = 1 + + +/obj/structure/clownstatue + name = "Bananium Clown Statue" + desc = "A golden statue made of bananium, commemorating the coronation of King Squiggles the Eighth." + icon = 'icons/obj/decorations.dmi' + icon_state = "clownstatue" + anchored = 1 density = 1 \ No newline at end of file diff --git a/icons/obj/decorations.dmi b/icons/obj/decorations.dmi index 326bb1f45cde234e255a30fd90dc5f6b5ab431ed..5d1959ee8adbd0d63858242511561f1551cc0654 100644 GIT binary patch literal 7619 zcmbt(_di@u)c;+p_mCjEL`~wO$Lgy@Z$U`(5WPlCuyzpy(R-A&1VQv3WtHeXh;Fq6 zSv65tdp6Hs@O@t2AMVV(bI;5r*}FL~PnMrK zedvefmaaVHQGeGWc*um>@Q2-yne2LRVz!a zd$=331CtkH)+k%LlE2v5Kb0NZf13;AW>pAgOf0v^VJ9cQvn^|03-1*#&6H`;LlK}#|v$C>4 zvw`$=b=lwdu~@KmCB3tg)atvxInmAlxdb4yji1a)laMnW<)iP$Cq9RLwn?JKVIxIS zqQ%@ImfOp=qf?C3%Z9vcZvR?Ty>RHb*eM;7OwX5aq@*%#9O z=T|5cmz|6Ypu1Hz33^VSz&HqR0ICe&sQfZwM-LA^@ktt1NWy8$v;r?M_O1eU>G6&7so7f>FOVPRpf z`r_CiFx*k7i|KYLC^s0l-Ad6|^KG&~@1+Ze%yIdb!=o+3+4(+lViFQEp!J}O!qL&u z^GjAe3KcS5ml3t+KCUFG=mr=QS$~mt37P`79+#=AP*|Yn&vwQgC^$@kaX0&)aM4U| zKv+~X-!*VGobiFQNpl}1H8owSMI1fDvzuVjy}lD44X*UnSLs*aI|GAK0s<~o{SOw$>VIr1gxG|i;x=Sei| zHKD@A#>U3oMd#os?pR0wBbSZrZ|SYh2TZ(!7it}7{PveE>dGn%n%Zk|n6qBV!3W{+ zgD{SaB;JR|zI{M^>p5@mpX5rLv0OQ+g>BB%X;0YZ(TM1V^OTT_Xg2dhEshE+HvH1v z>j3MhQdbIz4J7-V+#iT5Tcz%JEwKoKR7A)Cebb&KD^1LM0INwi8)DtL3G8W3_5Vy% z^2QEA-RC@8FQ-+mO)^|gUF@Ktx(8&JI^az-_id?S@N;95L{Jzbku zLkio?I4MNz^4@)__|zWn;lL~9218_x2S$Epwi=AQSlk@Eh9exsH3>ohgj7M%f~lFA zh`6{4Im{tmKy`xidA+<0Xan&I(+>M>afgdyCeq|+8qb6uNkUAVpv@bVb@XDdX`LGQ z!(sX%E^fZUV6i*?0ot~+sPj(OV)urQn}bE_Ser9e8KsM8TUk;Jk5kt5 z1L7y@A$v-e9J$yQGh`+8$ZLsKvTy&t_B4WuGxOkKfSWm1x@L!DrqUcK1I<(^cv=&D z74T12*qO@6CDo4Ok%>)eeXjfW?+@y%;Qs3Uqtd=Ph-A8ZR}l_ZP*qhu=vAhfD@AJ* za;)L(av~MzUJyr`nf@tVkN`%3*|(QXPS};(Yi?9myg(RGv4)E{dP`+ZcYz5QdU`cN zy^T@0@X|yYRJ2$4hI}zc!sNHS>zXm!gc*qcNUFSGC+B%qZdDPdj~F7jm^+8DGd}?^ z7)(kW7NKiCDl%PK897SD;yP)Al0;)bR}PtDI)9IFZz-*5%K@eY@QTEfU`dL{z$+?G zu??vHLuj2Q(rz3C6RWUl1gDtBw=Evem5(=yvZav4rdxy@)B^2PD_3*=(K#VoSHsw= zxpWJhy(L_OB=5d!;SXCOf0$qGaeZ8gIMt)6SzG2xJa6HbMH$3Xv%MLN65p<=SPt5C zaF4{<{C;QoUVU{z7+|Z@TjX2ja2KcheBmb|G0#JG`2?R1Ieh6jfqO%dRM4Dp2LUzo zD_ZUJkL*lL!gY`8m;cG+5bxyTB3A$KXo!S{0I-~5dV5(JuV5Td_9cIBMR5wm^kW?3 zQE+`ljs3^yh6B3KLGK8Y1mDLQ7ZsG0XuMY~*uav|*!=x9BIT`rvbPk|(C~OtqW(zI z3ubtvr5kRYb^E9Ow$%otyfPxkx8Gj=0_|i!BW;e6zDkmSIye-sY~T)bv5dB_UJ>Gb zq3_p7R_eZA*YU%dnQ6kB`GisnG_Ckwic}SIH13${N`qZ()W>%~xzYRTym(A4l-u}Kx!({Wej*d>+4`XwTIqX^%4?zda|99l+2W8`9pt~fchOJ}!cvXs3>~j;@ z#u4s-RabzSnVFnn)J_JGjO|t{c&fzM?d<5tNkv8Vk;3+Av>k#CXD^01DwDby3SjSu zI$m|6cUkX^g#;XZ{w2TA;06Z7A3uKJWG#kH;*n{(zMP!#lJ#ZQ_D0~nlw!<%);b#O z*h62eoAVuZ+2FQ-PZRv(2B`Y_J8f-kj&5$#zVyRCikqHcwl9T>tWLx_eV$Y~#O&E+ z<0Jlqxoh=b;1Av1+M!R$%gf726uvJ|H2p&=rYQK%tjOZ)KDM}RMj4vv%Fs(bAg|EM zm!_wdjCkWgWqtj#^EP}#|yetu(@TQXXK_81gNVId0U`;HJ6IYQ*TME&=fS z@oH}@3kce*4*gG}Nq%M~>?H{kD=Rm`8#_7q0oWL}E>n9bnu`^3y{ZWa*-~jDz}7Ap zjQHdC?zYh2qqe1*#t8-_r<1(ldO(o#<<`o;Fo?CG-JlFj>VqIm+p_h zH?G-xUWJ!fy{3X@DeesG*NP#gKPl2sj1WSpBLHs?f*GqOoE=f;?-TR1UYRHNZrK?a>FLGmyJF5OD#O!)0|RB=;di7qNq6$v)Q+10+7nwolEp@+iFxiTbizZ^;vY%o_4_NQrZog>gl^7?MW z2lsyAHX7JG{E#Hib-u1-%U>q1R}YiJov7ZVl>BEF)|jZ@5x-FJl@NvCh+pzIn~PJ} zXXQ*(=YJ-2;XXs9QD_j+U>5Rq8?}k^-<>a9P}kfYS`Jfks)_E~Yl(eiW)!2}QQVp) zSSq+cHmK=4(|t;ZlfKl$i8UDDb@eVJ1T=!dmyC}*;3r2%q}x8s+dk3`GE4SGnDhwHWBMjPE{L$9?Ah+mwkl^`~c*NGY6ae+vVpWOP_tUYS z1$||2Pd9H4kg70mV>NpmL~Ih|e2%nKIAZ&QL+z*dip4T3;_W<+!O%ddzXEw^G^Syt zthiW>G_srX9e<@K#60aV-4-GzCr1z)!hdyjr75Hz7#OG=p!8YY#Om1D@dI-Ro!y^wg zxz8xD48F^e@u!RL3sa7yz9Xm0wi4d`@+?UHlYziDo9b*>dDAWDD}DY?L2-TS5l1fy z9{Dc)^V9?$tuz4O<>Pz$c^^&3CfC={*qB_Xl}-TsXWnFeKHI14zoh-2Sv4UD`JSfN z_Wjr=TJkebCkrOA67gjje-H^A=c4R1Zt=)RE=Z{Pq_m!t2;BdwmXni^R)uDz{P02r zIg?C%*6Q%#2VuA-3xjh|Fq#9UPl|7=pHr@{ufOlHky@C$8VQ{)u6!d~(K@?Zc=S*r z7{HH1ynj)SW=n-_Z##X~f@$(dM^dxVZM9A0x3%SH>*+n*)@M{Q_B<#?GxYMVXJ`~w z%bLd+CKC>I*W({V9^aL8y+r7e7fkG1oUnOvH+Nb{7U#yCcKBe1Y?2R{5akv+c0J(Pn&XW#;CNYJ~Aer}=fu`(fNRP%ZAf$6Csy zXI{2B2tAdn@3ib+vGz9N)WWyHZwNsK(#p=@dxRiPM8XK&8(H=c+BF^oA6MZICMiDs z*1ByxF1Y;o62h&aX&A;V1N5AMng#A@(EY|@Qw7LUyM9k*ggF~-`G3{pf{A@d>N-J` zgkg3U8k6s<#bx|pmGat9&!w*dzcfAt z-q+VBA}=3jE&TqKXq2@u>DO4|&-L}GRB^W_i$~a*;dn1B6fn}pXcv4^uJ{OC`0eVp~o(jM#Bxy(|3@=?NtmO4^rx}aC@;-ZAUDh^5oA3fVX zL&)=u{{#l=WasaapAjiGyd{9DJJcSKhTr50beor8xWF zThge+Z))>M0O8Bp<#{y)1z}Uu(_F071r-&#wVxy(GW}P?K_0I8+w5h^RP$`p0QGvY zz994XWN6oe?=M25wh5=|L9pt=>u)|?3G`cD2oFCwAB1s6!1Zqax?K%-GEcr*$6bOiBGL@{lp0C2s zE6s(4sOB>tBl9F~9yw#*@X=4d)+n48cZ^8=S^{niwkkmOIo7ZT$x>M(_KDhsWT23g zQG8I66GGE6TrLsjZMwR;4>0)PiNZqyF;h&B7v)i=L+-69If1UTdNn@F;yJSKR`*95uGm6&}i$g+|%KrVFam_S&b z+&nrrmpvryjcX-|pxfGElfk{3KHyK-J$vX_cUlcfpWlJ=gW#c46rS-T!OYq@*Un}I zzkAX7cHSXrkuLgZ@pnVU|8@THq*@a*n7CROqr;DS&JFT>wqox34XZqEJQ=tF^FCZ`Xo9_HFyj8}I>MS>kxO{RR!*tyoqQvb)2D*$J=&5dSzS zPLu^TGSC0`G{Q1Zqlb#HE)uEQ%-;<(PM7BLB`$mEqHGF&K22gpUN3K^mDSl8d{hH% z5rs=ghYKDnz9R_!R7;reu*WcYa$|Ha923uT_|rEgbzRF+nTO1rp{6lMOKZbg_%k8i zrg$gY^o=wv(c2_=3Uj_R{yn+rS)z)s7N*E@yzte9PI~4TpW*#n=a%p(p;R+gyu=;a zk$F79c(7}LB3BI`Fn8y^=S$3}-dChGCE!ceD7i1$kW{N6F?V{bKem^o^;Ywty*k zeBVzz+|fIXI&C84t_&)`2;&^~=(ZW;3R09NFL*xkA(CNcP=YGwL|7!J1HacyA7;?g zZ)>JVQ8}B4IV+k7^W(#~!2Wf%(*!#dXIgkD>3d5;6`?JETnnm9jMQakXS~%yH}7$9 zxlg7Bm+}K~Iyc7O6P^;L^jpKwBhu%0sZqgBq@bt&9hyWaONoTs@{s{tX6X;PdDk>9 ze=4!Un`uqjU3Oh~eQNH?90hOm-?GbM6M;flN3;B_!>>nkWHh+xCd7l$nD~z$nei3Y zEZrN%d?RVc-G9}c;f|tQSJ{8tvASUZrFh8B?`?s9s>j3HkrV%55|5VWY8TN^3m6|g ziQHuPvx?@QIMd1O7owSzt(HRE8eVlQDHg0+6k;}^9#>m-A-$lCoa-;VIXr`5A|&~h zTcZ@4Y6g^aF+G1G7R$3E^LzJCH@7p(txB(kA4{n`^{HbyTI*RWD7Wt+#FLXACH7~| zxfw>?Rst!k)v}4C$2bE+bB z6}SlV^b=4KJ1H>QozL6d-F?>(;v~==*YNu)Tep~^;-mfu&XswwR8Qd5RAoD^RDVZO zZnI*L8ByWYL0vuhp|Ftc>PzamkBnUVcqtkF@Ig0>o^22l|48sEncQ;x%MiX@Hm3W$LJ9+3gp1Vs~|1zD}N!YU^bZyno?j;2b_J zt5)(6AsGVEwQ=Os)(p-Iq9&?TEk9-87OmvW4Kh3*;b@&&yzK>HFsLI_(ee;D53yM( z!*Y-SvH|<$>aQ$23r?3m*5)jw_kpsV)m|fJEM2%N+kPa?Y)pu*-9f1xYmLOIUK^4W zx0vpc!FE%dLLUfg%dL{9!G|&4EPA=FTr*a1*}nIcmzSsgGVsgPDz9@6{1+$v+0pm) z4y(qMNv-&G^Gh;I#r=NbE@^=#+IdPpnUWjK&@Vc__g`93OO2i9(nY3A+_Jj~W?FC(4GyIvzKokzuE$ly(|LZGyxC*JbRuZxd zD7~}5&iX7^2Dc%-cn%d>4l1}aWX$MC0AysJ(Y<)4$Ei`1eE1rOOWtxOh&^dc@VCM% z`|?j;dDGtzOIDZ{8$xRR=4ZSa2-t6zkDCZ)U-9}y5)BR#=Uv(L|Fi2?hYtU@u6t7( zBS8C^$TC3lvEOe(A-U=3jvcttqGzDcUQk|R9)0T-b*GxGtoe!&i6;8j!al9*61k(G z`@sTofEc|q*`ZDFyzN#-=HL?F-JzvMTD+zB^ytjtFgvnM&tYf@sKNb-<$$)<&EaXt z;ptB|SBqs9_UidIKpg1hF?O=cN#Bu4@ zdY2=dLf{#_CuAD228a{uOX@fdj47>y7?=qeWvDw`v$?FdMZ2ATdTJLtQhKh-nN|Nz za?3~~rqv6|3OcK3wXpblgURYBbon{v!rZR&*mXJT$+gbe*5%V|sho%Xwt%h#3IfD} z>NM@q{&(~#KHQvhU!UxIYu#+JyYyh>f@H4$UMMK%F*N=8czh6O^3s%f{C0{hkbl?J z8{%guN}M3d(XrolJJ}H3^DVL?%cE|sO#xtB?>G{#dUMP35(AHL@c=EKv(f5(=s>@@ zbGiKNz3sO+mle;!B5O+Fd5n_kMF`7&B0B!^n)~+;0(ys#9wY$+_&HhgxmYTpd@xbd zrSn_#vDt>Lt}L7mN|6Y5yvq*uERD(+fi9WO<$*X;hh-QLu1AkbHWo#EUH*o>{NL9} zBG3n9=GpxU!ct&Dus5bHm{XqU9Rv7#UF!&%{|54ph)j8mkk5hqh5<=nK(-P@a4 z*Rg6OLu3m`=Me$y(;V)f=$iK*wa?vJEg=KweE>J=|DE?UvH#hz%3GsE`3m(|$*d%+ z5|xSx_z~)IuPjv|5axYR(`QJ9Gny?8=;DalFe3V>lShRdf!q6sn>_YRn@%6tpPO3T z^d5%uWZRBbuhw>$!A0*6u*SXRr>+V(UhHLY-|wMfmYH-KPm$r+8d+$-c3wKsr8MTc zj!dk2W~$6BK6itkZloa|2|i5k>$voR ztBE^d!@p*aweewdz-2e*U%%soeYOU#tyf1i(I43Lu}2G}Vg>D8x(1!tJ~{iy8;NSz zy+81r4}bJh0>5{Dg(z}?s zS!;C6WhYE&7ILDO7p!b-R0J*<7!W97#)H>lqoX5=Q70Kyu^vouf}x(Ctgy;xyFBiX zCu?icSi7`ALm5^{p{KzDG|Y-vv4`MXA;=>Qd%h*H4SD6IU6nB=N65&JsP9@vgWQNG zQPV4Xr)?pm&@r`GWgShC9^q=v7ZWtBimzwH8jYp+qT3rA8#nzX&QO@YI#Hve*%lf- z0sECtIGRJwxQ3FjCc3SArfsp#lNO{!0gk0;H&#Hc%|p?kIJ zZ();@`GHP3AT;X1u2Bi>JLEfAM@dO3+!hFYcg#hgxw`Dl{v~`6lCr<=r=X$|!2}Tz zYApItcJB9NoyReJdO&0#Mq4~qTW9U~+Wf?jRu-e*m-#1)cuL0 zW$Ep>4cC8Hb8C6h1t-@(c*blQU1|A>hGP3njM~$46X)D1wtuGML1yWmnyTvLRl1OT z+p_yTuQ(+EAW_b?_sf?T8=IGPuO{LQ@=VLWT_oaus%dCU?jNtOwM;U_o$=l6cbAZQ zi3WVHb&0)9$TeblIl~eSA&_$)O5{uBWGmN0-%-&?-6?Kn*)NTCShf@6})?$K=Cy zTv&B(@x9n4H5-<*OeYjo8H>MOV6N}z42)W5xR(Szp`rnz) z{1$fDg4!Oir8Y0s-AR6yXG#JuG!{J(q z?ZR;0ovVFr@!wDu(Cg?5)+W(?8yi;F-htVu{bSwJ%=ti3tUder^l6T6`EV9ZfYWW9 zCdr_iy;D!XAGkbRNhkj@K3nm zEq@??^V*a77w=N2pTn7K2pNWXaX(xl(nvd8FSnyXY|Y&?^jjOE9=`Qp+FDy|?W&+` zhiA*-Azpa74w=E|diKF91hh|SAL6< zUR=08uz?A)VgeIxSZB#S;puOSa#+^qT=5-oH*f5R5N>yHR*T;<$(VF;cV~g&;LZ-mSGqSvNk04 zf!UgmY4$IrnQ;Mr&-8Z?&3S^Hw*61wt2-qKpD%~78nmR!PEzrAm`_pGrSB@XX3=Ns& zfyfSP3g(tXqgKChdO*LKQ<d3~Y=z*@_?Cg_w?kf#2XC%;#% zuBA7zreEs>k@;kITmd1}DV^RJcG|u%kf9aA(_{_LLfV5gAtNKhCo0-7!i*$xnv6hN zPBd3r+9i_|pUitg;;VdFOW+c(20@vWa}n&4E0FkZmo;3aYe$H*7i z&YICtcM{G7NdV8CEIGQ*wQ~LL(cB!GRbEX^ayIM~jT`&UO_#Z}sHUbyx?~{z!LaN0 za4u%F!)NJRyQ7IlSjC=j1?>0hqgx6AOVHM;UN9?Hv+A?Xk28YjT04O<- z5E@@!Us~Y1Z`VR!EFJdAdsxkw9eT7O+>yz`)|M9*c(ht{0qf%YwL3?Ydw|SjMHrFh zuwfp%3=I+Mrhs~_9&%9XTsuH6Me+8rbNFKdGyT-BV<>^YqdUn=`W*$)m14WyI9*Xt zZ`?jv#q3cZv5rEM$Xc<0GTZwK*8OH$CnJ_%r^54C7kT=?Ddy6!$NM%6pZ}z1j7E6lim~X(F=aMKN5`wW)wX0^UERp- zdz%GBjmXHz&@o8^+cCdKDUtUI;0!(|oh7R3ersIHMjlsiVv5G>uvGOY*$ca3VhaTw z_SG#df@h4NeCkZ&GcziY$Rm_7n`z02kT8jE_gDANBiqKupAS|BH`;szYi016zl(pJ z<%OQ#vmie>=AM%2aWJ`(i2GRa0q0Cu?gZb8#)ySu#H)R)N%zo_x7;H0!}OZ0Ba1EN z)@&Ld>!>GZuQbordlnbp@TN<7%`P1yY&SQrKko`fb3%_-KdJkzZ*GyGLAzn6feWPh zST)RMu|k@F4w#kE(NRD-To$mfvO4<@@DI-$!^`o{IJyFz6!{_FfNrKzMX_Sr)Q z%f`cZhfx_F(NEVn1e)1t#DSa9G}~EDH;leG?(4ofbS#k2X_>th`BpCZ?u9hCMDpEi z)1u$2_<}++>8pK9q>zYGL~L4`@PfGLW?Za(HPZX+qn#kF3T^f+$w0bheXw!bSImi@~x@9I2Um!vvs_ zYL?}A)59gMXAM-@l&Q|wa-;=+nwWT~pr}Y|gnwJa$gc@>A3pnIriWK<-5<5;y>zDS z0`cB=ok@DF0#YrW)FpK$h~c{s1rCS5URrV<$bW{z;f_;bv&@3OxWziN=za+_5Bdq$ zHOF)pT|B>?WSrnq!4rFh7F#U!dN9Iw%42K_Frv$W?Sk$`OQXK-@u zUqqPZYKU7x@?Ay=i61)m$NU!N>SDNkrjqLPZ{3RPccQ#MV6$R3E>jE8#7Dhf`TS2BJ)h_IM^~OwP-2MA-vI%>?%AZS6-jTud#{0 zfRzn#Y`ee)jTaOOtHu|Qw}9sYc_3Nu`ERmY41^Cr+GKTNc zwL~E`273yu5zChXBQ`V`A#iWY z0+4`{Xf?9j1cp~@msr9_{M11f{pzuYw97-K(;gMc>Ehb^oraS_qN-?aw#=vG^Dps# z$upjk=)5DTZt0J5T?W@Olm5U%R|=L9 zV=$HM*VAgc@KNu=GvZi9!!+|fu&!kzm59)ggYOo}4rD?764)Yrh@A5JeOswlfz~Dq z3OA$sXw(S|e{X?YRM;2)K&!A}Vq!ueSno&)wtMTGT;}Gxkcp=nGu7uVlMa7L+?VFI z4RNsZYgcx=T-$bA@afpP&`@e)5GPv?Ss(I<(>kL#DJ&l$nt0&3xd zj7cNrNxuY1?pTma`l$0 zclx^$S%6U0<1B-sCksu4LF@Q@wOV#WoOqxc>rTKB1vz?2@}ldOV32a|Ik8fez?$~! zh7cC5=qyxjc-pdQY^q`2TkIXYvXf#m8kdDx!`H!b5xtuQ+A~pi1i;|MaYily)$P{h zVw;G+AJPvh!={TINH-s=JvW9}m)(!vCplCVnw5;y%iKf~@5v!1Q}XAw=DH0o$G5NH z60cj#@CsetX|kG;nI32qppjzCJcmtZQsB;BW%T+u)O$BBPGt4iD{jN#O(m+YcDNuN zS{PXPK&WZWwMO*yzX3z#-V2mS>k?Oq(RCNvOGT1ODq+Oy_hwTd-_CsRMVZUWxw#r_ z_-BWAwF-LouF*DQzSPrwjifHXxuJi}w!3$QDO;g^f!_N_xvV!o7RyK=Uo2Q~D8Meq zPXtUn6D8yEcresf0%3~DUqDR(o%0kg^6GfgqJhjHlBw)D7cbg=)(wCbO=1 zOZ`jt{}THq?im;$P;3JT=&=BF2`<%HAewQ0TV2`ctRKG_JjVHEM<4y%X0Cd!Y0>(W z4`fFp!AY?RG2lV<-gOQ7mR0Oth|3HK2@xjXHx+bFoAb|DB0ba=@oBd)WnadrNV&Zh zewO`%ey8(b*^;=Wl(_cd>#g(s_j0!B=;nc)@*ML)*PjW$$Fx3IBMX*w_;SoS1k7C2 z#VBIaGGtY?M_I-k%1rslTeDtu$6;+q)F+j!jQu4=At&myewK3=6P94J4h66CW@Ano sibFNv8K^{+EZhAb&M&hu#uRQ;+kU5$`@;zEM=NmqCS0%lhTZf30@0w%LjV8( From 7ce41a086cca7312fdad67a36e76e3a72e876357 Mon Sep 17 00:00:00 2001 From: ZomgPonies Date: Fri, 29 May 2015 17:59:55 -0400 Subject: [PATCH 2/2] Mapmerge fuckup --- _maps/map_files/cyberiad/cyberiad.dmm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index e62aa126eab..839b9a1bd54 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -1191,8 +1191,8 @@ "awU" = (/obj/machinery/camera{c_tag = "Clown's Office"; dir = 4; network = list("SS13")},/turf/simulated/floor/wood,/area/clownoffice) "awV" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/wood,/area/clownoffice) "awW" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor/wood,/area/clownoffice) -"awX" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/item/flag/clown,/turf/simulated/floor/wood,/area/clownoffice) -"awY" = (/obj/machinery/light,/obj/structure/clownstatue,/turf/simulated/floor/wood,/area/clownoffice) +"awX" = (/obj/structure/rack,/obj/item/clothing/under/rank/clown,/obj/item/weapon/storage/backpack/clown,/obj/item/clothing/mask/gas/clown_hat,/obj/item/clothing/shoes/clown_shoes,/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/turf/simulated/floor/wood,/area/clownoffice) +"awY" = (/obj/item/flag/clown,/turf/simulated/floor/wood,/area/clownoffice) "awZ" = (/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/power/apc{dir = 8; name = "Fore Primary Hallway APC"; pixel_x = -24},/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) "axa" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/light,/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) "axb" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/hallway/primary/fore) @@ -6428,6 +6428,7 @@ "ctF" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "RnDChem"; name = "Biohazard Shutter"; opacity = 0},/obj/structure/grille,/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 4},/obj/structure/window/plasmareinforced{dir = 1},/obj/machinery/atmospherics/pipe/simple/insulated,/turf/simulated/floor/engine,/area/toxins/misc_lab) "ctG" = (/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "RnDChem"; name = "Biohazard Shutter"; opacity = 0},/obj/structure/grille,/obj/structure/window/plasmareinforced,/obj/structure/window/plasmareinforced{dir = 8},/obj/structure/window/plasmareinforced{dir = 1},/turf/simulated/floor/engine,/area/toxins/misc_lab) "ctH" = (/obj/structure/disposalpipe/segment,/turf/simulated/wall/r_wall,/area/toxins/misc_lab) +"ctI" = (/obj/machinery/light,/obj/structure/clownstatue,/turf/simulated/floor/wood,/area/clownoffice) "ctJ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/engine{icon_state = "stage_stairs"; name = "reinforced stairs"},/area/toxins/test_chamber) "ctK" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/sparker{id = "testigniter"; name = "Test Igniter"; pixel_x = -25},/turf/simulated/floor/engine,/area/toxins/test_chamber) "ctL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 8},/turf/simulated/floor/plating,/area/solar/starboard) @@ -8129,8 +8130,8 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoPaoPaoPaoPaoPaaaaaaaaaaaaaaaaaaaczaabarBarBarBarBarBaabatmaabarBarBarBarBarBaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoUauBaneauCasEarKauDauEauFauGarParQauHauIauJauKauIauLarXarPauMauNauOauNauNauOauNauPapmasRauQapmauRapmauSauTauUauVauWauWauXauYauZavaavaavaavbavcavdaveaveaveaaaasqaabaaaapCaqDapEaaaaaaapCaqDapEaaaaaaapCaqDapEaaaaaaaaaapCaqDapEaaaaaaamjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakhakhakhakhakhakhakhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoPaoPaoPaoPaoPaaaaaaaaaaaaaaaaaaaczaabasrassassassassastasuasvaswaswaswaswasxaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaavfavfavfavfavfavfaoUaoUavgaoUasEasEasEavhaviavjavkavkavlavkavlavkavkavmasJasJavnavoavpavqavoavpavqavravsavsavsavsavsapmavtavuavvavvavwavvavxavyavaavzavAavBavbavCavDavEavFavcaaaasqaabaaaapCaqDapEaaaaaaapCaqDapEaaaaaaapCaqDapEaaaaabaabapCaqDapEaabaabamjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakhakhakhakhakhakhakhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoPaoPaoPaoPaoPaaaaaaaaaaaaaaaaaaaczaabatlatlatlatlatlaabatmaabatlatlatlatlatlaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaavfavGavHavIavJavKavLavMavNavMavOavMavMavPavQavQavQavQavQavRavSavTavQavQavQavQavUavQavQavQavQavVavWavXavYavZawaawbawcapuawdaweawfawgawhawiawjawkavaawlawmawnavbawoawpawoawqavcaabasqaabaaaapCaqDapEaaaaaaapCaqDapEaaaaaaapCaqDapEaabaabaaaaabaoOaabaaaaaaamjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakhakhakhakhakhakhakhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoPaoPaoPaaaaaaaaaaaaaaaaaaaaaapBaaaaaaaaaaabaaaaaaaaaatmaaaaaaaaaaabaaaaaaaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaavfawrawsawtawuawXawvawwawxawyavVavVavVawzavVavVavVavVavVawAavVavVavVavVavVavVawBavVavVavVavVawCavVawDavVawEavVavVawFapuawGawHawIawJawfawKawjawLavaawMawNawOawPawQawRawSavFavcaabasqaabaaaapCaqDapEaaaaaaapCaqDapEaaaaaaapCaqDapEaaaaaaaaaaabasqaabaaaaaaawTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakhakhakhakhakhakhakhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaczaabarBarBarBarBarBaabatmaabarBarBarBarBarBaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaavfawUawVawWcZjawYavfawZaxaaxbaxcaxdaxeaxfaxgaxaaxcaxcaxcaxhaxcaxcaxcaxcaxcaxcaxiaxjaxkaxkaxkaxlaxmaxnaxmaxoaxpaxmaxqapuaxraxraxraxraxraxrawjawkavaaxsawmaxtavbawoaxuawoawqavcarxaxvarAaaaaaaaoOaabaabaabaabaoOaabaabaabaabaoOaabaabaabaabaxwaxxarAaabaaaamjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakhakhakhakhakhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoPaoPaoPaaaaaaaaaaaaaaaaaaaaaapBaaaaaaaaaaabaaaaaaaaaatmaaaaaaaaaaabaaaaaaaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaavfawrawsawtawuawYawvawwawxawyavVavVavVawzavVavVavVavVavVawAavVavVavVavVavVavVawBavVavVavVavVawCavVawDavVawEavVavVawFapuawGawHawIawJawfawKawjawLavaawMawNawOawPawQawRawSavFavcaabasqaabaaaapCaqDapEaaaaaaapCaqDapEaaaaaaapCaqDapEaaaaaaaaaaabasqaabaaaaaaawTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakhakhakhakhakhakhakhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaczaabarBarBarBarBarBaabatmaabarBarBarBarBarBaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaavfawUawVawWawXctIavfawZaxaaxbaxcaxdaxeaxfaxgaxaaxcaxcaxcaxhaxcaxcaxcaxcaxcaxcaxiaxjaxkaxkaxkaxlaxmaxnaxmaxoaxpaxmaxqapuaxraxraxraxraxraxrawjawkavaaxsawmaxtavbawoaxuawoawqavcarxaxvarAaaaaaaaoOaabaabaabaabaoOaabaabaabaabaoOaabaabaabaabaxwaxxarAaabaaaamjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaakhakhakhakhakhaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoMaxyaoMaaaaaaaaaaaaaaaaaaaaaaczaabasrassassassassastasuasvaswaswaswaswasxaaaaczaaaaaaaaaaaaaabaaaaaaaaaaaaavfavfavfavfavfavfavfaxzaxzaxAaxBaxCaxDaxEaxFaxGaxHaxIaxGaxJaxGaxKaxKaxKaxKaxKaxKaxLaxKaxKaxMaxNaxOaxPaxzaxQaxzaxRaxzaxzaqzanTanTanTanTanTaxSawkavaaxTawmaxUavbaxVawRawSavFavcasqaxWaxXaryaryaxvaryaryaryaryaxvaryaryaryaryaxvaryaryaryaxYaxZaxWasqaabaaaamjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabayaaybayaaaaaaaaaaaaaaaaaaaaaaaczaabatlatlatlatlatlaabaycaabatlatlatlatlatlaabaczaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxAaydayeayfaxEaygaxGayhayiayjaykaylaymaynayoaypayqayraysaytayuayvavVavWaywayxayyayzayzayzayzayzayAayzayzayzayzayBayCayDayEayFayGayHayIayJawoawqavcayKaxvayLaabaabaaaaabayMayNayNayNayNayNayOaabaaaaaaaaaaaaaabayPayQayLaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaayRaySayTaaaayUayVayWaaaaabayXayYayXaaaaaaaaaaaaaaaaaaaaaaczaaaaabaabaabaabaabaaaayZaaaaaaaaaaaaaaaaaaaabaczaaaaaaaaaaagaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaazaazbazcazdaxEaygaxGazeazfazgaykazhaziazjazjazjazjazjaysazjazkavQavVavWaxzazlazmaznaznaznaznazoazpazqazqazqazqazqazqazrazsaztazuazvazwazxazyavcavcazzazzazzazzazzazzazzazAazBazBazBazBazBazAazCaaaaaaaaaaaaaabaabazDaabaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa