diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 6dd604150a7..b83d6903e6c 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -31028,8 +31028,8 @@ /turf/simulated/floor/plasteel, /area/maintenance/electrical) "dgb" = ( -/obj/structure/bed/dogbed/pet, /mob/living/simple_animal/goose/Scientist, +/obj/structure/bed/dogbed/pet, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm index e84673d5d60..f4f67d49dc5 100644 --- a/_maps/map_files/cerestation/cerestation.dmm +++ b/_maps/map_files/cerestation/cerestation.dmm @@ -91517,8 +91517,8 @@ }, /area/security/main) "wGA" = ( -/obj/structure/bed/dogbed/pet, /mob/living/simple_animal/goose/Scientist, +/obj/structure/bed/dogbed/pet, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplefull" diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 02a1f224777..31fcc03be79 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -29933,12 +29933,7 @@ "bzd" = ( /obj/structure/flora/tree/jungle/small, /obj/structure/flora/ausbushes/sparsegrass, -/turf/simulated/floor/plasteel{ - desc = "\"This is a plaque in honour of those who died in the great space lube airlock incident.\" Scratched in beneath that is a crude image of a clown and a spaceman. The spaceman is slipping. The clown is laughing."; - dir = 4; - icon_state = "plaque"; - name = "Memorial Plaque" - }, +/turf/simulated/floor/grass, /area/hallway/secondary/exit) "bze" = ( /obj/effect/turf_decal/siding/wood{ @@ -75794,11 +75789,11 @@ /turf/simulated/floor/plating, /area/maintenance/fsmaint2) "kLu" = ( -/mob/living/simple_animal/goose/Scientist, /obj/structure/chair/sofa/corp, /obj/machinery/light{ dir = 1 }, +/mob/living/simple_animal/goose/Scientist, /turf/simulated/floor/plasteel{ icon_state = "white" }, diff --git a/_maps/map_files/generic/CentComm.dmm b/_maps/map_files/generic/CentComm.dmm index fd52f3ffebe..bcdf06196d7 100644 --- a/_maps/map_files/generic/CentComm.dmm +++ b/_maps/map_files/generic/CentComm.dmm @@ -2440,8 +2440,7 @@ "biD" = ( /obj/structure/table/wood/fancy/black, /obj/item/stack/spacecash/c1000000{ - desc = "Баксоны максона. Возможно кто-то приобретет пропуск."; - name = "100.000 �������� �������" + name = "1000000 Credit" }, /obj/item/stack/telecrystal/twohundred_fifty{ amount = 115; @@ -15155,17 +15154,6 @@ icon_state = "dark" }, /area/centcom/specops) -"hWS" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/statue/artchair{ - layer = 10; - pixel_y = 10 - }, -/obj/effect/turf_decal/plaque{ - layer = 3 - }, -/turf/simulated/floor/grass, -/area/centcom/evac) "hXg" = ( /obj/effect/decal/syndie_logo{ icon_state = "logo16" @@ -23269,13 +23257,13 @@ /area/ninja/outpost) "maJ" = ( /obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/statue/elwycco{ - layer = 10; - pixel_y = 10 - }, /obj/effect/turf_decal/plaque{ layer = 3 }, +/obj/structure/statue/artchair{ + layer = 10; + pixel_y = 10 + }, /turf/simulated/floor/grass, /area/centcom/evac) "mbd" = ( @@ -24650,8 +24638,8 @@ /area/shuttle/trade/sol) "mBV" = ( /obj/item/gun/projectile/automatic/sniper_rifle{ - desc = "На прикладе этой винтовки нацарапано 'гей'"; - name = "Потрёпанная снайперская винтовка" + desc = "Оружие с потёртой надписью 'Коатс' и нечитаемыми каракулями возле неё."; + name = "Потрёпанная Снайперская Винтовка" }, /turf/simulated/floor/plasteel{ icon_state = "darkfull" @@ -26594,13 +26582,13 @@ /area/syndicate_mothership/infteam) "nli" = ( /obj/docking_port/stationary/transit{ + dheight = 10; dir = 8; height = 30; id = "freegolem_transit"; name = "free golem in transit"; pixel_x = 32; - width = 20; - dheight = 10 + width = 20 }, /turf/space/transit/west{ icon_state = "black" @@ -32596,12 +32584,6 @@ /turf/simulated/floor/wood, /area/centcom/zone1) "pXf" = ( -/obj/item/cardboard_cutout{ - anchored = 1; - desc = "Обычная статуя офицера, что она здесь делает? На табличке красуется надпись - Pizdyach Rodnenkiy"; - icon_state = "cutout_ntsec"; - name = "Officer" - }, /obj/structure/window/reinforced{ color = "red"; dir = 4 @@ -34061,13 +34043,6 @@ /obj/structure/chair/sofa/right, /turf/simulated/floor/carpet/red, /area/centcom/zone1) -"qIk" = ( -/obj/effect/turf_decal/plaque{ - layer = 3 - }, -/obj/structure/statue/mooniverse, -/turf/simulated/floor/redgrid, -/area/syndicate_mothership) "qIt" = ( /obj/structure/chair/comfy/shuttle{ dir = 4 @@ -49944,22 +49919,22 @@ /obj/machinery/door/airlock/external, /obj/docking_port/mobile{ dir = 8; - name = "Funeral shuttle"; - id = "funeral"; - height = 7; - width = 10; dwidth = 2; - roundstart_move = "graveyard_dock" + height = 7; + id = "funeral"; + name = "Funeral shuttle"; + roundstart_move = "graveyard_dock"; + width = 10 }, /obj/docking_port/stationary/transit{ - name = "Funeral In transit"; dir = 8; - pixel_x = 32; + dwidth = 2; + height = 7; id = "funeral_transit"; + name = "Funeral In transit"; + pixel_x = 32; turf_type = /turf/space/transit/north; - height = 7; - width = 10; - dwidth = 2 + width = 10 }, /turf/simulated/floor/shuttle/plating, /area/shuttle/funeral) @@ -60522,7 +60497,7 @@ nYK nYK nYK mZE -qIk +wBD jjR xNs xGb @@ -102886,7 +102861,7 @@ vgN upv gdL gdL -hWS +xKz qwy gpF gdL diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm index 38f3a956792..00062588aa4 100644 --- a/code/game/objects/structures/barsign.dm +++ b/code/game/objects/structures/barsign.dm @@ -362,28 +362,8 @@ icon = "spaceasshole" desc = "Open since 2125, Not much has changed since then; the engineers still release the singulo and the damn miners still are more likely to cave your face in that deliver ores." -/datum/barsign/evahumanspace - name = "SS220 EVA Human in Space" - icon = "evahumanspace" - desc = "Safety is a privilege." - -/datum/barsign/warpsurf - name = "SS220 Warp Surf" - icon = "warpsurf" - desc = "Welcome to the club, buddy!" - -/datum/barsign/papacafe - name = "SS220 Space Daddy's Cafe" - icon = "papacafe" - desc = "Respect your Space Daddy!" - -/datum/barsign/wycctide - name = "SS220 Wycctide" - icon = "wycctide" - desc = "Oh no, it's coming!" - /datum/barsign/shitcur - name = "SS220 Shitcur" + name = "SS1984 Shitcur" icon = "shitcur" desc = "Innocence proves nothing." diff --git a/code/modules/mob/living/simple_animal/friendly/animals_named.dm b/code/modules/mob/living/simple_animal/friendly/animals_named.dm index 481b71d0770..689cb02d4e8 100644 --- a/code/modules/mob/living/simple_animal/friendly/animals_named.dm +++ b/code/modules/mob/living/simple_animal/friendly/animals_named.dm @@ -33,8 +33,8 @@ health = 40 /mob/living/simple_animal/goose/Scientist - name = "Гуськор" - desc = "Учёный Гусь. Везде учусь. Крайне умная птица. Обожает генетику. Надеемся это не бывший пропавший генетик..." + name = "Гусар" + desc = "И учёный, и жнец, и на дуде игрец." icon_state = "goose_labcoat" icon_living = "goose_labcoat" icon_dead = "goose_labcoat_dead" diff --git a/icons/obj/barsigns.dmi b/icons/obj/barsigns.dmi index aeff73e3e5e..10fb762f4b8 100644 Binary files a/icons/obj/barsigns.dmi and b/icons/obj/barsigns.dmi differ