diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 06b01e59..bbbe63d2 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -51,7 +51,7 @@ "aaY" = (/obj/machinery/door/firedoor,/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 8},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/research{dir = 4; name = "Containment Pen"; req_access_txt = "55"},/turf/open/floor/plasteel,/area/science/xenobiology) "aaZ" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/public/glass{dir = 4; name = "Recreation Room"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/crew_quarters/fitness/recreation) "aba" = (/obj/machinery/door/airlock/medical/glass{dir = 4; name = "Chemistry Lab"; req_access_txt = "5; 33"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/firedoor,/turf/open/floor/plasteel/white,/area/medical/chemistry) -"abb" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/public/glass{dir = 4; name = "Holodeck Door"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 8},/turf/open/floor/plasteel,/area/crew_quarters/fitness/recreation) +"abb" = (/obj/machinery/door/airlock/public/glass{name = "Departure Lounge"; dir = 4; step_x = 0; step_y = 0},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/white/corner{dir = 1},/area/hallway/primary/central) "abc" = (/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 4},/obj/machinery/door/airlock/research{dir = 4; name = "Research Division Access"; req_access_txt = "47"},/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel/dark,/area/science/explab) "abd" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/public/glass{dir = 4; name = "Holodeck Door"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 8},/turf/open/floor/plasteel,/area/crew_quarters/fitness/recreation) "abe" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/structure/cable{icon_state = "2-4"},/obj/machinery/door/airlock/research{dir = 4; name = "R&D Lab"; req_access_txt = "0"; req_one_access_txt = "7;29;30"},/obj/effect/turf_decal/delivery,/obj/structure/disposalpipe/segment{dir = 6},/turf/open/floor/plasteel,/area/science/lab) @@ -76,14 +76,13 @@ "abx" = (/obj/machinery/door/airlock/public/glass{name = "Departure Lounge"; dir = 4; step_x = 0; step_y = 0},/turf/open/floor/plasteel/white/corner{dir = 1},/area/hallway/secondary/exit/departure_lounge) "aby" = (/obj/structure/lattice,/obj/structure/grille,/turf/open/space,/area/space/nearstation) "abz" = (/obj/machinery/door/firedoor,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel/white/corner{dir = 1},/area/hallway/secondary/exit/departure_lounge) -"abA" = (/obj/machinery/door/airlock/public/glass{name = "Departure Lounge"; dir = 4; step_x = 0; step_y = 0},/turf/open/floor/plasteel/white/corner{dir = 1},/area/hallway/primary/central) +"abA" = (/obj/machinery/door/airlock/public/glass{name = "Departure Lounge"; dir = 4; step_x = 0; step_y = 0},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/open/floor/plasteel,/area/hallway/primary/central) "abB" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/door/airlock/maintenance{dir = 4; req_access_txt = "12"},/turf/open/floor/plating,/area/maintenance/department/crew_quarters/bar) "abC" = (/obj/machinery/door/airlock/public/glass{name = "Departure Lounge"; dir = 4; step_x = 0; step_y = 0},/turf/open/floor/plasteel,/area/hallway/secondary/exit/departure_lounge) "abD" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible{dir = 4},/obj/machinery/portable_atmospherics/canister/nitrous_oxide,/turf/open/floor/plasteel/dark,/area/engine/engineering) "abE" = (/obj/machinery/door/firedoor,/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel,/area/hallway/secondary/exit/departure_lounge) -"abF" = (/obj/machinery/door/airlock/public/glass{name = "Departure Lounge"; dir = 4; step_x = 0; step_y = 0},/turf/open/floor/plasteel,/area/hallway/primary/central) +"abF" = (/obj/machinery/door/airlock/public/glass{name = "Departure Lounge"; dir = 4; step_x = 0; step_y = 0},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel/white/corner,/area/hallway/primary/central) "abG" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/public/glass{dir = 4; name = "Departure Lounge"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/white/corner,/area/hallway/secondary/exit/departure_lounge) -"abH" = (/obj/machinery/door/airlock/public/glass{name = "Departure Lounge"; dir = 4; step_x = 0; step_y = 0},/turf/open/floor/plasteel/white/corner,/area/hallway/primary/central) "abI" = (/obj/structure/lattice,/turf/open/space,/area/space/nearstation) "abJ" = (/obj/structure/lattice,/obj/machinery/camera/motion{c_tag = "MiniSat External Fore"; dir = 1; network = list("minisat")},/turf/open/space,/area/space/nearstation) "abK" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/public/glass{name = "Central Access"; dir = 4; step_x = 0; step_y = 0},/turf/open/floor/plasteel,/area/hallway/secondary/entry) @@ -6782,7 +6781,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoHaoHaoIaoHaaaaqaaraaqcaaaaqaaraaqcaaaaqaaraaqcaaaaqaaraaqcaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahtahtahtahtaxCaxCaxCaxCaxCaxCaxCaxCaDmaiuaiuaaaaaaaaaaaaaaaaaaapEawHakAawIawJawJatBawKawJawJatBawKawJawJatBawLawMawNajMawOawPawQauHawRauHawSauHauHauHawTawRawUawVawWawWawXawYawZaxaasSaxbaxbaxbaxbaxbasSaxcaxdaxearAlQQaxgaxhahtahtaxiaxjaxkaxlaxkaxkaxmaxnawdawdaxiahtapXapXapXapXapXaxocoiaxpaxqaxraxtaxurTZaxvaxwaxwaxxaxwaxwaaFaurauraurauraurabdaxzaxAavmaaaaaaaaaaaaaaaabNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoHaaaaoIaaaaaaaaaayyaaaaaaaaaayyaaaaaaaaaayyaaaaaaaaaayyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxBayzaxBayAayBayCaxCxuvkJoasraitaaaaaaaaaaaaaaaaaaajMaxEajMaxFaxGaxGaxHaxGaxGaxGaxIaxGaxGaxGaxJaxKaxGaxLaxJaxGaxGaxGaxMawRaxNaxOaxPaxQauHaxRaxSaxTaxUaxVaxWawUaxXaxYaxZayaaybaybaybaybaybayaaycaxYaydaaoayfaygaxhaaaaaaaaaaaaaaaaaaabIawdayhaxnabIabIaaaaaaayiayjaykaylatfaymaBQaynayoayqcojaysaIhaaBayuayuayvaxwaxwavmauraurauraurauravmaywayxavmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoHaoIazGazHazHazIazJazKazKazKazKazKazKazKazKazKazKazKazKazKazKazLazHazHazHazHazHazHazHazHazHazHazHazHazHazHrKrazNhzdazPazQazRaapazNfAxtyLaitaaaaaaaaaaaaaaaaaaaiuayEayFayLayGayHayIayLayLayJayLayLayLayLayLayMayNayOaxGaxGayPayQayRawRaySayTayUayVaaCayXayYayZazaazbazcawRazdazeazfazgazhaziazjazkazhazlazmaznazoarAlQQazpaxhaaaaaaaaaaaaabIaxiawdawdazqaxnawdaxiaaaaaaayiazrazsaztaaDawraDfazvazxazycokazAazAaaZazCazCazDaxwaxwavmauraurauraurauravmazEazFavmaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoHaaaaoIaaaaaaaaaaAVaaaaaaaaaaAVaaaaaaaaaaAVaaaaaaaaaaAVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxBaxBaxBaAWaAXaAYaxCvtTaDmajDaiuaaaaaaaaaaaaaaaaaaaiuaAbaAcaAdpFyaAeaAfaAiaAiaAgaAhaAiaAiaAiaAiaAjaAkaAlaAmaAmaAnaxGaAoawRaApaAqaAraAsauHaAtaAuaAvaAwaAxaAyawRaAzaAAaABaABaABaABaACaABaABaABaABaADaAEaAFaAFaAGaAHaAHaAHaAHaAHaAHaAHaAIaAJaAKaALaAMaANaaaaaaapXapXapXapXapXaAOaDfcolaAPaAQayravkdbiaxvaxwaxwaASaxwaxwaaFaurauraurauraurabbaATaAUavmabIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoHaaaaoIaaaaaaaaaaAVaaaaaaaaaaAVaaaaaaaaaaAVaaaaaaaaaaAVaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxBaxBaxBaAWaAXaAYaxCvtTaDmajDaiuaaaaaaaaaaaaaaaaaaaiuaAbaAcaAdpFyaAeaAfaAiaAiaAgaAhaAiaAiaAiaAiaAjaAkaAlaAmaAmaAnaxGaAoawRaApaAqaAraAsauHaAtaAuaAvaAwaAxaAyawRaAzaAAaABaABaABaABaACaABaABaABaABaADaAEaAFaAFaAGaAHaAHaAHaAHaAHaAHaAHaAIaAJaAKaALaAMaANaaaaaaapXapXapXapXapXaAOaDfcolaAPaAQayravkdbiaxvaxwaxwaASaxwaxwaaFaurauraurauraurabdaATaAUavmabIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoHaoHaoIaoHaaaaqaaCaaqdaaaaqaaCaaqdaaaaqaaCaaqdaaaaqaaCaaqdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxCaxCaxCaxCaxCaxCaxCvtTaDmnPAaiuaiuaiuaiuaiuebDebDgSHebDxLCebDaiuaBcaBdaBdaBdaBeaBfaBeaBdaBdaBdaBgaxGaBhaBiaBiaBiaBiaBiaBjaBjaBjaBjaBjawRaBkaBlaBmaBnaBoaBpawRaBqaBraABaBsaBtaBuaBvaBwaBxaBsaABaBraByaAHaBzaBAaBBaBCaBDaBEaBFaBGaAHaBHaBIaBJaALaBKawdaaaaaaaBLaBMaBNaBOatfaBPaBQaBRavkavkaBSavkdbiaxvaBTaBUaBVaBWaBXavmauraurauraurauravmaBYaBZatnabIabIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoHaaaaqaaCaaqdaaaaqaaCaaqdaaaaqaaCaaqdaaaaqaaCaaqdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiuaiuaDmmtuaiuaCdnyOawEaiusbYaCexJyjjCxeBaCfaiuaChaBdaCiaCjaCkaClaCmaCnaCoaBdaCpaCqaBhaBiaCraCsaCtaCuaCvaCwvTLaCxgkRawRaCyaCzaCAaCBaCBaCCaCDaCEaCFaABaCGaCHaCIaCJaCKaCLaCMaCNaxZaCOaAHaCPaCQaCRaCSaCSaCSaCTaCUaaqaCWaCXaCYaCZaDaawdaaaaaaaBLaDbaDcaDdaaGcomconcooaDgaDhaDiaDjaDkatnatnatnatnatnatnavmauraurauraurauravmatnaDlatnabIaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoHaaaaqaaCaaqdaaaaqaaCaaqdaaaaqaaCaaqdaaaaqaaCaaqdaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiuapBaDmaCcaiuhHrezJqGuaarfuPgPVsJreEpnSohnuaiueQZaBdaDoaDpaDqaDraCkaDtaCkaBdaDuaxGaDvaBiaDwaDxaDyaDzaDzaDAaDAoyFaDBawRaDCaDDaDEaDEaDFaDGaasaDIaDJaABaDKaCKaDLaDMaDLaCKaDNaABaDOaDPaataDRaDSaDTaDUaDVaDWaDXaDYaAHaDZaBIaEaaALaEbaANaaaaaaapXapXapXapXapXapXcopapXaEcaEdaEdaEeaEdaEdaEfaEgaEhaEdaEiatnauraurauraurauratnaEjaEkaEjaEjaEjaElaEjahiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -6802,9 +6801,9 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaahtaaaahtaHAhwdeApaQraSvaSwaSxnGiaRCklBaRBaiujThvIcabteDCxnPrHAeHIaRGoEAaLuaALaPRaKIaRIaKTaRJaRKaRLaRLaRMaRLaRLaRLaRLaRLaRNaRNaROaRNaRNaRNaRNaRNaRPaPEaRQaRRaRSaRTaRUaRVaRWaKYaKYaKYaRXaKYaKYaKYaPBaRYaRZaSaaSbaKTaMbaPRaMcaPWaScaSdaSclAsaSeaSflAsiKbaSgaShlAsaLgaLgaSiaSjaSkcDacRJcDacDacDaaLgaLgaaaaaaaaaaaaaaaaaaaaaaaaaaaaElaNRaSlaLmaLmaLmaLmaSmaSnaSoaLmabIaaaaaaaaaaaaaaaaaaaaaaaaaaaabyaaaaTCaTDaTEaaaaTCaTDaTEaaaaTCaTDaTEaaaaTCaTDaTEaaaaTCaTDaTEaaaabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabIabIabIaHAwwraJEaQraTKaTLaTMnGiaQsklBaRBaiuaSuxxSoEAtnYqjxffJyfOqWMoEAaLuaALaPRaKIcoVaKTaSzaRLaRLaSAaSBaSCaSDaSEaSFaSGaRNaRNaSHaRNaSIaSJaSKaSLaSMaPEaSNaSOaSPaSQaPEaSRaSScoWcoWcoWaSTaQNaQNaQNaQNaQNaQNaQNaSVabwaSXaPRaHEaSYaSZaTaaSZaTbaTcaTdaTeaTfaTgaTheeQaTiwDZaTkaTlaTmaTnaTqaTpaTqaTraTsaTraaaaaaaaaaaaaaaaaaaaaaaaaaaaElaTuaTvaTwaTxaTxaaQaTzaTAaTBaLmabImZEaaaaaaaaaaaaaaaaaaaaaaaaabyaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaHAaHAaHAaHAxeeaOkftWoLRaMLaMLaMLaPnaTJhkQaOsaiuaiuvAqoEAuCSiPOoEAhDGoEAoEAaRHaTOaPRaTPaKTaKTaSzaRLaRLaTQaTRaTSaTTaTUaXSaTWaRNaTXaTYaTZaSKaSKaUaaRNaUbaPEaUcaUdaSPaUeaPEaPEaUgaPEaPEaPEaPEaPEaPEaPEaUfaUfaUfaUfaNjaKTaUiaUjaUkaUlaOTaOTaUmaOTaOTaUnaaRaUpaUqaUraUsaUtaUuaUvaUwaUtaUxaSkaSkaSkaUyaUzsQtaUAaaaaaaaaaaaaaaaaaaaaaaaaaEjaUBaGOaUCaEjaEjaEjaEjaEjaEjaEjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyabIaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTHaKyaKzaKzwquaKBaOkcoNpGepGegmOpGepGevsJftWfUAabxnfiuLFdpamalpOrdpaaUGaUHabzabAaUKaULaUMabBaUOaUPaUQaURaUSaUTaUUaXSaXUaXSaUWaRNaUXaUYaSKaUZaVaaVbaRNaVcqENaPEaVdaPEcpaaPEaPEaVfaVgaVhaVicpbcpcaVjaPEaVkaVlaVmaUfaVnaUfaVoaJIaJZaUsaVpaVqaVpaVpaVpaVraVsaVtaVuaVvaLfaVwaVxaVyaTmaVzaVAaTmaTmaVBaPdaPdaPdaaaaaaaaaaaaaaaaaaaaaaaaaaaaEjaElaEjaVEaEjaVFaEjaVGaVHaVIaEjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxeeaHAaHAaHAnYnaJEkvjaQtaQuaQtaQuaQtaVNaJEaVMabCaJEaVOdTVdTVgeUdTVaVPdTVabEabFxvOwunaVRaVSaVSaVTaVUaVSaRLaRLaRLaRLaVVaRLaRLaRNaVWaVXaSKaSKaVYaVZaWaaWbbdvaWdaWeaWfaWgaWhcpeaWiaWjbahbahbahaWlaWmaPEaWnaWoaWpaWqaWraUfaMbaDZaMcaPWaWsaWtaWuaWuaWuaWuaWvaVtaPYaWwlfZaWxaVxaWyaTmaWzaTmaTmaTmaWAaUyaWBsQtaaaaaaaaaaaaaaaaaaaaaaaaaaaahtaaaaEjaUCaEjaFiaHuaFiaFiaFiaElaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqICaKzwKawqufTYaWEftWaOfaOfgpCaOfaOfcJofwexmpabGaWFaWFaWFaWIaWJaWFaWJaWFxmpabHaCZaEaaKIaVSaWMaWNaWOaVSaWPaWQaWQaWRaWSaWTkEWaRNaRNaRNaRNaWUaWVaWWaRNaWXaWYaXbaXbaXbaXcaXdaPEeyTbahbahaXhbahbeBbckaPEaXkaXlaXmaXnaXoaXpaXqaHNaXraLfaPWaXsaXtaXuaPWaLfaLfaVtaPYaXvaLfaXwaVxaXxaTmaVzaTmaTmcCBaXyaXzaXAaXzaaaaaaaaaaaaaaaaaaaaaaaaaaaahtaaaaEjaUCaEjaFiaEjaFiaXCaXCaElaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTHaKyaKzaKzwquaKBaOkcoNpGepGegmOpGepGevsJftWfUAabxnfiuLFdpamalpOrdpaaUGaUHabzabbaUKaULaUMabBaUOaUPaUQaURaUSaUTaUUaXSaXUaXSaUWaRNaUXaUYaSKaUZaVaaVbaRNaVcqENaPEaVdaPEcpaaPEaPEaVfaVgaVhaVicpbcpcaVjaPEaVkaVlaVmaUfaVnaUfaVoaJIaJZaUsaVpaVqaVpaVpaVpaVraVsaVtaVuaVvaLfaVwaVxaVyaTmaVzaVAaTmaTmaVBaPdaPdaPdaaaaaaaaaaaaaaaaaaaaaaaaaaaaEjaElaEjaVEaEjaVFaEjaVGaVHaVIaEjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaxeeaHAaHAaHAnYnaJEkvjaQtaQuaQtaQuaQtaVNaJEaVMabCaJEaVOdTVdTVgeUdTVaVPdTVabEabAxvOwunaVRaVSaVSaVTaVUaVSaRLaRLaRLaRLaVVaRLaRLaRNaVWaVXaSKaSKaVYaVZaWaaWbbdvaWdaWeaWfaWgaWhcpeaWiaWjbahbahbahaWlaWmaPEaWnaWoaWpaWqaWraUfaMbaDZaMcaPWaWsaWtaWuaWuaWuaWuaWvaVtaPYaWwlfZaWxaVxaWyaTmaWzaTmaTmaTmaWAaUyaWBsQtaaaaaaaaaaaaaaaaaaaaaaaaaaaahtaaaaEjaUCaEjaFiaHuaFiaFiaFiaElaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqICaKzwKawqufTYaWEftWaOfaOfgpCaOfaOfcJofwexmpabGaWFaWFaWFaWIaWJaWFaWJaWFxmpabFaCZaEaaKIaVSaWMaWNaWOaVSaWPaWQaWQaWRaWSaWTkEWaRNaRNaRNaRNaWUaWVaWWaRNaWXaWYaXbaXbaXbaXcaXdaPEeyTbahbahaXhbahbeBbckaPEaXkaXlaXmaXnaXoaXpaXqaHNaXraLfaPWaXsaXtaXuaPWaLfaLfaVtaPYaXvaLfaXwaVxaXxaTmaVzaTmaTmcCBaXyaXzaXAaXzaaaaaaaaaaaaaaaaaaaaaaaaaaaahtaaaaEjaUCaEjaFiaEjaFiaXCaXCaElaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaHAaHAaHAaHAxeeaWKppQaWKduQppQaWKaWKppQaWKaOsaHzaXFaXGkAaaXKaXKaXIaXJaXIaXKaXBaGUaHmaXLaXMaXNaXOaXPaVSaXQaXRaXSaXTaXUaXVaXWaXXaXYaXZaRNaRNaYaaRNaRNaYbaRNaRNaRNaPEaPEaYdaPEaYeaYfaYgaYgaYgaYhaYiaPEaYjaUfaYkaYlaYmaUfaMbaDZaMcaLfaYnaYoaYpaYqaYraYsaPWaVtaPYaYuaLfaYvaYwaYxaYyaYzaTjaYyaYAaYBaLgaLgaLgaaaaaaaaaaaaaaaaaaaaaaaaaaaaEjaElaEjaUCaYCaFiaEjaYDaYEaYFaElaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaaTCaUDaTEaaaabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaYGaYGaYGaYGaYGaYGaYGaYGaYGaYGaYGaYGaYGaYGaYGaXHaYHaYIfowaYJaYKaXIaALaEaaYLaVSaVSaYMaVSaVSaYNaXSaYOaYOaYPaXSaXSaXSaXSaYQbgkaYRaYSbcerxVaYVaYUaYTaYXaYYcpgaYZaZaaZbaZccphaZdcpicpjcpkaZfaZgaUfaUfaUfaUfaUfaZhaDZaZiaLfaZjaVuaPYaPYaOVaZkaaSaZmaZnaOTaUlaZoaZpaZqaZoaZoaZraZsaZtcCTaLgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaElaZvaTxaZwbaGbaGbaGbaGbaGbaGbaGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaTCaUDbaIaaaaTCaUDbaIaaaaTCaUDbaIaaaaTCaUDbaIaaaaTCaUDbaIaaaabyabIabyabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaZxaZyaZyaZyaZzaZAovMaZAaZAaZAaZAaZAaZCaZDaZEaXHaZFaZGaZHaZIaZJaZKaZLaZMaZNaVSaZOaZPaZQaVSaZRaZSaZTaZUaZVaZWaZXaXSaXSaXSgamaYSaYSaYSaYScplbabbacbadbaebahbagbahbagbahbagbeBbagbahbagbahbanaPEbaobapbaqaPEbaraDZaMcaLfbasbatbaubavbawbaxaPWaPYaPYaPYbazaTmaZtbaAbaBbaCbaDbaEaZpbaFaLgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaElaUCaGOaFibaGbbLbbMbaHrWEsutrWEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbPaaaaaaaaabbPaaaaaaaaabbPaaaaaaaaabbPaaaaaaaaabbPaaaaaacFBabIcFBabyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm index a01884e5..0f2e94db 100644 --- a/code/__DEFINES/citadel_defines.dm +++ b/code/__DEFINES/citadel_defines.dm @@ -69,9 +69,10 @@ #define BREASTS_SIZE_HUGE 16 #define BREASTS_SIZE_MASSIVE 17 #define BREASTS_SIZE_GIGA 25 + //Bodysize Limits -#define MIN_BODYSIZE 80 -#define MAX_BODYSIZE 120 +#define MIN_BODYSIZE 50 +#define MAX_BODYSIZE 150 #define BREASTS_SIZE_MIN BREASTS_SIZE_A #define BREASTS_SIZE_DEF BREASTS_SIZE_D diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 679d113e..4595c449 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -162,7 +162,7 @@ #define TRAIT_XRAY_VISION "xray_vision" #define TRAIT_THERMAL_VISION "thermal_vision" #define TRAIT_CUM_PLUS "cum_plus" -#define TRAIT_NEVER_CLONE "noclone" +#define TRAIT_NEVER_CLONE "donotclone" // common trait sources diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 5bcf6f32..a690c63f 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -368,7 +368,7 @@ medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events." //Port from Shadow -/datum/quirk/noclone +/datum/quirk/donotclone name = "DNC" desc = "You have filed a Do Not Clone order, stating that you do not wish to be cloned. You can still be revived by other means." value = -2 diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 5aebf2aa..710ad37e 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -558,6 +558,13 @@ item_state = "almaz" squeak_override = list('modular_citadel/sound/voice/raptor_purr.ogg' = 1) +/obj/item/toy/plush/lizardplushie/malric + desc = "An adorable stuffed toy that resembles a certain drake. He looks tired." + icon_state = "malric" + item_state = "malric" + attack_verb = list("depressed", "tailwhipped", "hissed on") + squeak_override = list('modular_citadel/sound/voice/weh.ogg' = 1) + /obj/item/toy/plush/snakeplushie name = "snake plushie" desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing." diff --git a/hyperstation/code/modules/resize/resizing.dm b/hyperstation/code/modules/resize/resizing.dm index 86254176..41b78119 100644 --- a/hyperstation/code/modules/resize/resizing.dm +++ b/hyperstation/code/modules/resize/resizing.dm @@ -64,7 +64,7 @@ mob/living/get_effective_size() return 1 //Smaller person stepping under a larger person - if(tmob.get_effective_size() > get_effective_size()) + if(abs(tmob.get_effective_size()/get_effective_size()) >= 2) H.forceMove(tmob.loc) now_pushing = 0 micro_step_under(tmob) @@ -136,7 +136,7 @@ mob/living/get_effective_size() tmob.mob_pickup_micro_feet(H) return 1 - if(tmob.get_effective_size() > get_effective_size()) + if(abs(tmob.get_effective_size()/get_effective_size()) >= 2) H.forceMove(tmob.loc) now_pushing = 0 micro_step_under(tmob) diff --git a/icons/obj/plushes.dmi b/icons/obj/plushes.dmi index ce3e0ada..266c067b 100644 Binary files a/icons/obj/plushes.dmi and b/icons/obj/plushes.dmi differ diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index fd6294dd..1ea03dfe 100644 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -51,8 +51,11 @@ /obj/item/reagent_containers/pill/penis_enlargement = 3, /obj/item/reagent_containers/pill/breast_enlargement = 3, /obj/item/clothing/gloves/latexsleeves = 3, - /obj/item/clothing/shoes/highheels = 3 - + /obj/item/clothing/shoes/highheels = 3, + /obj/item/clothing/under/polychromic/stripper = 3, + /obj/item/clothing/under/polychromic/bikini = 3, + /obj/item/clothing/under/polychromic/shortpants/pantsu = 3, + /obj/item/clothing/under/polychromic/bulge = 3 ) contraband = list(/obj/item/restraints/handcuffs/fake/kinky = 5, /obj/item/clothing/neck/petcollar = 5, diff --git a/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index ba4fa378..e565894a 100644 --- a/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/modular_citadel/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -18,6 +18,21 @@ new /obj/item/clothing/under/polychromic/shorts(src) new /obj/item/clothing/under/polychromic/shorts(src) new /obj/item/clothing/under/polychromic/shorts(src) + new /obj/item/clothing/under/polychromic/shortpants/pantsu(src) + new /obj/item/clothing/under/polychromic/shortpants/pantsu(src) + new /obj/item/clothing/under/polychromic/shortpants/pantsu(src) + new /obj/item/clothing/under/polychromic/bulge(src) + new /obj/item/clothing/under/polychromic/bulge(src) + new /obj/item/clothing/under/polychromic/bulge(src) + new /obj/item/clothing/under/polychromic/bikini(src) + new /obj/item/clothing/under/polychromic/bikini(src) + new /obj/item/clothing/under/polychromic/bikini(src) + new /obj/item/clothing/under/polychromic/stripper(src) + new /obj/item/clothing/under/polychromic/stripper(src) + new /obj/item/clothing/under/polychromic/stripper(src) + new /obj/item/clothing/under/polychromic/bottomless(src) + new /obj/item/clothing/under/polychromic/bottomless(src) + new /obj/item/clothing/under/polychromic/bottomless(src) new /obj/item/clothing/mask/bandana/red(src) new /obj/item/clothing/mask/bandana/red(src) new /obj/item/clothing/mask/bandana/blue(src) diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index 99098631..283a744d 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -360,10 +360,36 @@ name = "Pink stripper outfit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/stripper_pink - cost = 3 /datum/gear/greenstripper name = "Green stripper outfit" category = SLOT_W_UNIFORM path = /obj/item/clothing/under/stripper_green - cost = 3 + +/datum/gear/polybikini + name = "Polychromic Bikini" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/polychromic/bikini + cost = 2 + +/datum/gear/polystripper + name = "Polychromic Stripper Outfit" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/polychromic/stripper + cost = 2 + +/datum/gear/polypantsu + name = "Polychromic Panties" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/polychromic/shortpants/pantsu + +/datum/gear/polybulge + name = "Polychromic Voluminous Thong" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/polychromic/bulge + +/datum/gear/polybottomless + name = "Polychromic Bottomless Shirt" + category = SLOT_W_UNIFORM + path = /obj/item/clothing/under/polychromic/bottomless + cost = 2 \ No newline at end of file diff --git a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm b/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm index c0f7a5d6..d89a9708 100644 --- a/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm +++ b/modular_citadel/code/modules/clothing/under/polychromic_clothes.dm @@ -165,4 +165,37 @@ primary_color = "#808080" //RGB in hexcode secondary_color = "#FFFFFF" tertiary_color = "#8CC6FF" - body_parts_covered = CHEST|GROIN \ No newline at end of file + body_parts_covered = CHEST|GROIN + +/obj/item/clothing/under/polychromic/bikini + name = "polychromic bikini" + desc = "Perfect for summer." + icon_state = "polybikini" + item_color = "polybikini" + item_state = "rainbow" + hastertiary = FALSE + primary_color = "#808080" //RGB in hexcode + secondary_color = "#FFFFFF" + body_parts_covered = CHEST|GROIN + +/obj/item/clothing/under/polychromic/stripper + name = "polychromic stripper outfit" + desc = "Sexy with style." + icon_state = "polystripper" + item_color = "polystripper" + item_state = "rainbow" + hastertiary = FALSE + primary_color = "#808080" //RGB in hexcode + secondary_color = "#FFFFFF" + body_parts_covered = CHEST|GROIN + +/obj/item/clothing/under/polychromic/bulge + name = "polychromic voluminous thong" + desc = "What is this? Is there something hidden inside or is just to compensate the lack of?" + icon_state = "polybulge" + item_color = "polybulge" + item_state = "rainbow" + hastertiary = FALSE + primary_color = "#808080" //RGB in hexcode + secondary_color = "#FF3535" + body_parts_covered = GROIN \ No newline at end of file diff --git a/modular_citadel/icons/polyclothes/item/uniform.dmi b/modular_citadel/icons/polyclothes/item/uniform.dmi index 87c3479a..d47f0df0 100644 Binary files a/modular_citadel/icons/polyclothes/item/uniform.dmi and b/modular_citadel/icons/polyclothes/item/uniform.dmi differ diff --git a/modular_citadel/icons/polyclothes/mob/uniform.dmi b/modular_citadel/icons/polyclothes/mob/uniform.dmi index 15b5262b..4610524c 100644 Binary files a/modular_citadel/icons/polyclothes/mob/uniform.dmi and b/modular_citadel/icons/polyclothes/mob/uniform.dmi differ