diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index ded8aae4..28ec4cbf 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -2,7 +2,7 @@ "aab" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = 24},/obj/structure/rack,/obj/item/grenade/barrier{pixel_x = -3; pixel_y = 1},/obj/item/grenade/barrier,/obj/item/grenade/barrier{pixel_x = 3; pixel_y = -1},/obj/item/grenade/barrier{pixel_x = 6; pixel_y = -2},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ai_monitored/security/armory) "aac" = (/obj/effect/landmark/carpspawn,/turf/open/space,/area/space) "aad" = (/obj/structure/rack,/obj/item/clothing/suit/armor/bulletproof,/obj/item/clothing/head/helmet/alt,/obj/item/clothing/suit/armor/bulletproof,/obj/item/clothing/head/helmet/alt,/obj/item/clothing/suit/armor/bulletproof,/obj/item/clothing/head/helmet/alt,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ai_monitored/security/armory) -"aae" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/mob/living/simple_animal/hostile/retaliate/bat{desc = "A fierce companion for any person of power, this spider has been carefully trained by Kinaris specialists. Its beady, staring eyes send shivers down your spine."; emote_hear = list("chitters"); faction = list("spiders"); harm_intent_damage = 3; health = 200; icon_dead = "guard_dead"; icon_gib = "guard_dead"; icon_living = "guard"; icon_state = "guard"; maxHealth = 250; max_co2 = 5; max_tox = 2; melee_damage_lower = 15; melee_damage_upper = 20; min_oxy = 5; movement_type = 1; name = "Sergeant Araneus"; real_name = "Sergeant Araneus"; turns_per_move = 10},/turf/open/floor/carpet,/area/crew_quarters/heads/hos) +"aae" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/mob/living/simple_animal/hostile/retaliate/bat{desc = "A spider who's been revived and pacified by a miner, now it's yours. Sometimes you shiver in fear."; emote_hear = list("chitters"); faction = list("spiders"); harm_intent_damage = 3; health = 200; icon_dead = "guard_dead"; icon_gib = "guard_dead"; icon_living = "guard"; icon_state = "guard"; maxHealth = 250; max_co2 = 5; max_tox = 2; melee_damage_lower = 15; melee_damage_upper = 20; min_oxy = 5; movement_type = 1; name = "Sir Eight-Mor"; real_name = "Sir Eight-Mor"; turns_per_move = 10},/turf/open/floor/carpet,/area/crew_quarters/heads/hos) "aaf" = (/obj/structure/lattice,/turf/open/space,/area/space/nearstation) "aag" = (/obj/structure/grille,/obj/structure/lattice,/turf/open/space,/area/space/nearstation) "aah" = (/obj/structure/cable{icon_state = "0-2"},/obj/machinery/power/tracker,/turf/open/floor/plating/airless,/area/solar/port/fore) @@ -318,7 +318,7 @@ "agg" = (/obj/structure/cable/yellow{icon_state = "2-8"},/turf/open/floor/plasteel/dark,/area/crew_quarters/heads/hos) "agh" = (/obj/structure/table/wood,/obj/item/flashlight/lamp,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/carpet,/area/crew_quarters/heads/hos) "agi" = (/obj/structure/table/wood,/obj/item/stamp/hos,/turf/open/floor/carpet,/area/crew_quarters/heads/hos) -"agj" = (/obj/item/phone{desc = "Supposedly a direct line to Kinaris Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3},/obj/item/cigbutt/cigarbutt{pixel_x = 5; pixel_y = -1},/obj/structure/table/wood,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/carpet,/area/crew_quarters/heads/hos) +"agj" = (/obj/item/phone{desc = "Who can it be now?"; pixel_x = -3; pixel_y = 3},/obj/item/cigbutt/cigarbutt{pixel_x = 5; pixel_y = -1},/obj/structure/table/wood,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/carpet,/area/crew_quarters/heads/hos) "agk" = (/obj/structure/cable/yellow{icon_state = "2-4"},/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plasteel/dark,/area/crew_quarters/heads/hos) "agl" = (/obj/structure/table/wood,/obj/item/paper_bin{pixel_x = -3; pixel_y = 7},/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plasteel/dark,/area/crew_quarters/heads/hos) "agm" = (/obj/effect/spawner/structure/window/reinforced,/obj/structure/cable/yellow{icon_state = "0-8"},/obj/structure/cable/yellow{icon_state = "0-2"},/obj/machinery/door/poddoor/preopen{id = "hosprivacy"; name = "privacy shutters"},/turf/open/floor/plating,/area/crew_quarters/heads/hos) @@ -932,7 +932,7 @@ "asp" = (/turf/open/floor/plasteel/grimy,/area/security/main) "asq" = (/obj/machinery/computer/security/telescreen/interrogation{pixel_y = 32},/turf/open/floor/plasteel/grimy,/area/security/main) "asr" = (/obj/machinery/light/small{dir = 1},/turf/open/floor/plasteel/grimy,/area/security/main) -"ass" = (/obj/item/phone{desc = "Supposedly a direct line to Kinaris Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3},/obj/item/cigbutt/cigarbutt{pixel_x = 5; pixel_y = -1},/obj/structure/table/wood,/obj/machinery/firealarm{dir = 8; pixel_x = 28},/turf/open/floor/plasteel/grimy,/area/security/main) +"ass" = (/obj/item/phone{desc = "Who can it be now?"; pixel_x = -3; pixel_y = 3},/obj/item/cigbutt/cigarbutt{pixel_x = 5; pixel_y = -1},/obj/structure/table/wood,/obj/machinery/firealarm{dir = 8; pixel_x = 28},/turf/open/floor/plasteel/grimy,/area/security/main) "ast" = (/obj/structure/rack,/obj/item/clothing/suit/hazardvest,/turf/open/floor/plating,/area/maintenance/fore) "asu" = (/obj/machinery/space_heater,/turf/open/floor/plating{icon_state = "platingdmg1"},/area/maintenance/fore) "asv" = (/obj/structure/closet/emcloset,/turf/open/floor/plating,/area/maintenance/fore) @@ -3149,7 +3149,7 @@ "biX" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/machinery/ai_slipper{uses = 10},/turf/open/floor/circuit,/area/ai_monitored/turret_protected/ai) "biY" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/open/floor/circuit,/area/ai_monitored/turret_protected/ai) "biZ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/turf/open/floor/plasteel/dark,/area/ai_monitored/turret_protected/ai) -"bja" = (/obj/structure/table/reinforced,/obj/item/phone{pixel_x = -3; pixel_y = 3},/obj/item/cigbutt/cigarbutt{pixel_x = 5; pixel_y = -1},/obj/item/radio/intercom{broadcasting = 1; frequency = 1447; listening = 0; name = "Station Intercom (AI Private)"; pixel_x = 28},/turf/open/floor/plasteel/dark,/area/ai_monitored/turret_protected/ai) +"bja" = (/obj/structure/table/reinforced,/obj/item/phone{desc = "Who can it be now?"; pixel_x = -3; pixel_y = 3},/obj/item/cigbutt/cigarbutt{pixel_x = 5; pixel_y = -1},/obj/item/radio/intercom{broadcasting = 1; frequency = 1447; listening = 0; name = "Station Intercom (AI Private)"; pixel_x = 28},/turf/open/floor/plasteel/dark,/area/ai_monitored/turret_protected/ai) "bjb" = (/obj/structure/window/reinforced{dir = 1; layer = 2.9},/turf/open/space,/area/space/nearstation) "bjc" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1; layer = 2.9},/turf/open/space,/area/space/nearstation) "bjd" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/light{dir = 4},/obj/structure/cable/yellow{icon_state = "1-2"},/obj/effect/turf_decal/tile/blue{dir = 4},/turf/open/floor/plasteel/white/corner,/area/hallway/secondary/entry) @@ -3608,7 +3608,7 @@ "brO" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/hatch{name = "MiniSat Access"; req_one_access_txt = "32;19"},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/dark,/area/engine/break_room) "brP" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel/dark,/area/engine/break_room) "brQ" = (/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/turf/open/floor/plasteel/dark,/area/engine/break_room) -"brR" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/structure/table/glass,/obj/item/phone{pixel_x = -3; pixel_y = 3},/obj/item/cigbutt/cigarbutt{pixel_x = 5; pixel_y = -1},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/open/floor/plasteel/dark,/area/engine/break_room) +"brR" = (/obj/structure/window/reinforced{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/structure/table/glass,/obj/item/phone{desc = "Who can it be now?"; pixel_x = -3; pixel_y = 3},/obj/item/cigbutt/cigarbutt{pixel_x = 5; pixel_y = -1},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/turf/open/floor/plasteel/dark,/area/engine/break_room) "brS" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/lattice/catwalk,/obj/structure/cable{icon_state = "4-8"},/obj/structure/window/reinforced{dir = 8},/obj/structure/transit_tube/curved{dir = 4},/turf/open/space,/area/space/nearstation) "brT" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/lattice/catwalk,/obj/structure/cable{icon_state = "4-8"},/obj/structure/transit_tube/horizontal,/turf/open/space,/area/space/nearstation) "brU" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/lattice/catwalk,/obj/structure/cable{icon_state = "4-8"},/obj/structure/transit_tube/horizontal,/obj/machinery/atmospherics/pipe/simple/orange/visible,/turf/open/space,/area/space/nearstation) @@ -3923,7 +3923,7 @@ "bxR" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plasteel/grimy,/area/tcommsat/computer) "bxS" = (/obj/machinery/light_switch{pixel_y = 28},/obj/structure/showcase/cyborg/old{pixel_y = 20},/turf/open/floor/plasteel/grimy,/area/tcommsat/computer) "bxT" = (/obj/structure/table/wood,/obj/machinery/status_display/ai{pixel_y = 31},/obj/item/flashlight/lamp,/turf/open/floor/plasteel/grimy,/area/tcommsat/computer) -"bxU" = (/obj/machinery/light/small{dir = 4},/obj/item/radio/intercom{dir = 8; freerange = 1; name = "Station Intercom (Telecomms)"; pixel_y = 30},/obj/structure/table/wood,/obj/item/phone{pixel_x = -3; pixel_y = 3},/obj/item/cigbutt/cigarbutt{pixel_x = 5; pixel_y = -1},/turf/open/floor/plasteel/grimy,/area/tcommsat/computer) +"bxU" = (/obj/machinery/light/small{dir = 4},/obj/item/radio/intercom{dir = 8; freerange = 1; name = "Station Intercom (Telecomms)"; pixel_y = 30},/obj/structure/table/wood,/obj/item/phone{desc = "Who can it be now?"; pixel_x = -3; pixel_y = 3},/obj/item/cigbutt/cigarbutt{pixel_x = 5; pixel_y = -1},/turf/open/floor/plasteel/grimy,/area/tcommsat/computer) "bxV" = (/turf/closed/wall,/area/aisat) "bxW" = (/obj/structure/chair,/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/hallway/secondary/entry) "bxX" = (/obj/structure/chair,/obj/structure/sign/warning/vacuum/external{pixel_y = 32},/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/plasteel,/area/hallway/secondary/entry) @@ -4470,14 +4470,14 @@ "bIs" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/structure/cable/yellow{icon_state = "4-8"},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel,/area/crew_quarters/bar) "bIt" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/door/firedoor,/turf/open/floor/carpet,/area/crew_quarters/bar) "bIu" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/carpet,/area/crew_quarters/bar) -"bIv" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/landmark/xmastree,/turf/open/floor/carpet,/area/crew_quarters/bar) -"bIw" = (/obj/structure/disposalpipe/segment{dir = 10},/turf/open/floor/carpet,/area/crew_quarters/bar) +"bIv" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/effect/landmark/xmastree,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/open/floor/carpet,/area/crew_quarters/bar) +"bIw" = (/obj/structure/disposalpipe/segment{dir = 10},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/open/floor/carpet,/area/crew_quarters/bar) "bIx" = (/obj/machinery/vending/gato,/turf/open/floor/wood,/area/crew_quarters/bar) "bIy" = (/obj/structure/cable/yellow{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/structure/chair/sofachair,/turf/open/floor/wood,/area/crew_quarters/bar) "bIz" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/machinery/jukebox,/turf/open/floor/wood,/area/crew_quarters/bar) "bIA" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/wood,/area/crew_quarters/bar) "bIB" = (/obj/structure/table/wood,/obj/item/ashtray{name = "candle holder"; pixel_y = 4},/obj/item/clothing/mask/cigarette/cigar{pixel_x = 6},/obj/item/candle{pixel_y = 10},/turf/open/floor/wood,/area/crew_quarters/bar) -"bIC" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/obj/structure/cable/yellow{icon_state = "2-8"},/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/open/floor/carpet,/area/crew_quarters/bar) +"bIC" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/obj/structure/cable/yellow{icon_state = "2-8"},/obj/structure/disposalpipe/segment,/turf/open/floor/carpet,/area/crew_quarters/bar) "bID" = (/obj/structure/sign/poster/random{pixel_y = -32},/obj/structure/window/reinforced{dir = 8},/obj/item/twohanded/required/kirbyplants/random,/turf/open/floor/wood,/area/crew_quarters/bar) "bIE" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/bbqribs{pixel_y = -8},/obj/item/ashtray{name = "candle holder"; pixel_y = 4},/obj/item/candle{pixel_y = 10},/turf/open/floor/wood,/area/crew_quarters/bar) "bIF" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plating,/area/maintenance/starboard) @@ -4559,8 +4559,8 @@ "bKd" = (/obj/machinery/light_switch{pixel_y = -28},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5},/obj/machinery/light,/turf/open/floor/wood,/area/crew_quarters/bar) "bKe" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/table/wood,/turf/open/floor/wood,/area/crew_quarters/bar) "bKf" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/structure/chair/sofa/left{dir = 4},/turf/open/floor/wood,/area/crew_quarters/bar) -"bKg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/turf/open/floor/carpet,/area/crew_quarters/bar) -"bKh" = (/obj/machinery/light/small,/obj/structure/cable/yellow{icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 5},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/open/floor/wood,/area/crew_quarters/bar) +"bKg" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 10},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/turf/open/floor/carpet,/area/crew_quarters/bar) +"bKh" = (/obj/machinery/light/small,/obj/structure/cable/yellow{icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 5},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/wood,/area/crew_quarters/bar) "bKi" = (/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = -29},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/wood,/area/crew_quarters/bar) "bKj" = (/obj/structure/chair/sofachair{dir = 1},/turf/open/floor/wood,/area/crew_quarters/bar) "bKk" = (/obj/structure/chair/sofa/right{dir = 4},/turf/open/floor/wood,/area/crew_quarters/bar) @@ -4874,11 +4874,11 @@ "bQn" = (/obj/structure/sign/plaques/kiddie/perfect_drone{pixel_y = 32},/obj/structure/table/wood,/obj/item/storage/backpack/duffelbag/drone,/obj/structure/window/reinforced,/turf/open/floor/carpet,/area/bridge/showroom/corporate) "bQo" = (/obj/structure/showcase/mecha/marauder,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/carpet,/area/bridge/showroom/corporate) "bQp" = (/obj/structure/bookcase,/turf/open/floor/wood,/area/bridge/showroom/corporate) -"bQq" = (/obj/structure/table/wood,/obj/item/phone{desc = "Supposedly a direct line to Kinaris Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3},/obj/item/cigbutt/cigarbutt{pixel_x = 5; pixel_y = -1},/obj/machinery/light{dir = 1},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = 21},/turf/open/floor/wood,/area/bridge/showroom/corporate) +"bQq" = (/obj/structure/table/wood,/obj/item/phone{desc = "Who can it be now?"; pixel_x = -3; pixel_y = 3},/obj/item/cigbutt/cigarbutt{pixel_x = 5; pixel_y = -1},/obj/machinery/light{dir = 1},/obj/item/radio/intercom{name = "Station Intercom (General)"; pixel_y = 21},/turf/open/floor/wood,/area/bridge/showroom/corporate) "bQr" = (/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/wood,/area/bridge/showroom/corporate) "bQs" = (/obj/machinery/light_switch{pixel_y = 25},/obj/machinery/light/small{dir = 1},/obj/structure/table/wood,/obj/item/clothing/shoes/laceup,/obj/item/clothing/glasses/sunglasses,/obj/machinery/camera{c_tag = "Corporate Showroom"},/turf/open/floor/wood,/area/bridge/showroom/corporate) "bQt" = (/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/yellow{icon_state = "1-2"},/obj/structure/window/reinforced,/obj/structure/showcase/machinery/cloning_pod{layer = 4; pixel_x = 2; pixel_y = 5},/turf/open/floor/carpet,/area/bridge/showroom/corporate) -"bQu" = (/obj/structure/showcase/perfect_employee,/obj/structure/sign/plaques/kiddie/perfect_man{pixel_y = 32},/obj/structure/window/reinforced,/turf/open/floor/carpet,/area/bridge/showroom/corporate) +"bQu" = (/obj/structure/showcase/perfect_employee,/obj/structure/sign/plaques/kiddie/perfect_man{pixel_y = 32; desc = "A guide to the exhibit, explaining how recent developments in mindshield implant and cloning technologies by GATO have led to the development and the effective immortality of the 'perfect man', the loyal GATO Employee."},/obj/structure/window/reinforced,/turf/open/floor/carpet,/area/bridge/showroom/corporate) "bQv" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/structure/window/reinforced,/obj/effect/decal/cleanable/cobweb/cobweb2,/obj/structure/showcase/machinery/implanter{layer = 2.7; pixel_y = 4},/turf/open/floor/carpet,/area/bridge/showroom/corporate) "bQw" = (/turf/closed/wall,/area/gateway) "bQx" = (/obj/structure/bed/roller,/obj/machinery/vending/wallmed{pixel_x = -28},/obj/machinery/camera{c_tag = "Gateway - Atrium"; dir = 4},/obj/effect/turf_decal/bot{dir = 1},/turf/open/floor/plasteel{dir = 1},/area/gateway) @@ -5040,7 +5040,7 @@ "bTx" = (/turf/open/floor/wood{icon_state = "wood-broken3"},/area/bridge/showroom/corporate) "bTy" = (/obj/machinery/cell_charger,/obj/item/stock_parts/cell/crap,/obj/structure/table/wood,/turf/open/floor/carpet,/area/bridge/showroom/corporate) "bTz" = (/obj/effect/decal/cleanable/dirt,/obj/machinery/holopad,/turf/open/floor/carpet,/area/bridge/showroom/corporate) -"bTA" = (/obj/structure/table/wood,/obj/item/toy/plush/carpplushie{color = "red"; name = "Kinaris wildlife department space carp plushie"},/turf/open/floor/carpet,/area/bridge/showroom/corporate) +"bTA" = (/obj/structure/table/wood,/obj/item/toy/plush/carpplushie{color = "red"; name = "GATO wildlife department space carp plushie"},/turf/open/floor/carpet,/area/bridge/showroom/corporate) "bTB" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/turf/open/floor/wood,/area/bridge/showroom/corporate) "bTC" = (/turf/open/floor/wood,/area/bridge/showroom/corporate) "bTD" = (/obj/structure/table/wood,/obj/machinery/button/door{id = "corporate_privacy"; name = "corporate showroom shutters control"; pixel_x = 28; req_access_txt = "19"},/obj/item/poster/random_official,/obj/item/poster/random_official,/obj/item/poster/random_official,/obj/item/poster/random_official,/obj/item/poster/random_official,/obj/item/paicard{desc = "A real Kinaris success, these personal AIs provide all of the companionship of an AI without any law related red-tape."; name = "Kinaris-brand personal AI device exhibit"},/turf/open/floor/carpet,/area/bridge/showroom/corporate) @@ -5104,9 +5104,9 @@ "bUJ" = (/obj/structure/cable/yellow{icon_state = "1-2"},/obj/structure/table/wood,/obj/structure/extinguisher_cabinet{pixel_x = -27},/obj/item/folder/blue,/obj/item/clothing/head/collectable/HoP{name = "novelty HoP hat"},/obj/machinery/light/small{dir = 8},/turf/open/floor/carpet,/area/bridge/showroom/corporate) "bUK" = (/obj/structure/table/wood,/obj/item/storage/secure/briefcase{desc = "A large briefcase with a digital locking system, and the Kinaris logo emblazoned on the sides."; name = "Kinaris-brand secure briefcase exhibit"; pixel_y = 2},/turf/open/floor/carpet,/area/bridge/showroom/corporate) "bUL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/wood,/area/bridge/showroom/corporate) -"bUM" = (/obj/structure/showcase/machinery/microwave{dir = 1; pixel_y = 2},/obj/structure/table/wood,/turf/open/floor/carpet,/area/bridge/showroom/corporate) +"bUM" = (/obj/structure/showcase/machinery/microwave{dir = 1; pixel_y = 2; desc = "The famous GATO microwave, the multi-purpose cooking appliance every station needs! This one appears to be drawn onto a cardboard box."},/obj/structure/table/wood,/turf/open/floor/carpet,/area/bridge/showroom/corporate) "bUN" = (/obj/structure/cable/yellow{icon_state = "2-4"},/obj/item/toy/beach_ball{desc = "The simple beach ball is one of Kinaris's most popular products. 'Why do we make beach balls? Because we can! (TM)' - Kinaris"; name = "Kinaris-brand beach ball"; pixel_y = 7},/obj/structure/table/wood,/turf/open/floor/carpet,/area/bridge/showroom/corporate) -"bUO" = (/obj/structure/cable/yellow{icon_state = "2-4"},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/nuclearbomb/beer{pixel_x = 2; pixel_y = 6},/obj/structure/table/wood,/turf/open/floor/carpet,/area/bridge/showroom/corporate) +"bUO" = (/obj/structure/cable/yellow{icon_state = "2-4"},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/nuclearbomb/beer{pixel_x = 2; pixel_y = 6; desc = "One of the more successful achievements of the GATO Corporate Warfare Division, their nuclear fission explosives are renowned for being cheap to produce and devastatingly effective. Signs explain that though this particular device has been decommissioned, every GATO station is equipped with an equivalent one, just in case. All Captains carefully guard the disk needed to detonate them - at least, the sign says they do. There seems to be a tap on the back."; name = "GATO-brand nuclear fission explosive"},/obj/structure/table/wood,/turf/open/floor/carpet,/area/bridge/showroom/corporate) "bUP" = (/obj/structure/cable/yellow{icon_state = "2-4"},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/item/storage/box/matches{pixel_x = -2; pixel_y = 3},/obj/item/clothing/mask/cigarette/cigar{pixel_x = 4; pixel_y = 1},/obj/item/clothing/mask/cigarette/cigar{pixel_x = -4; pixel_y = 1},/obj/item/clothing/mask/cigarette/cigar/cohiba,/obj/structure/table/wood,/turf/open/floor/carpet,/area/bridge/showroom/corporate) "bUQ" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/structure/showcase/machinery/tv{dir = 1; pixel_x = 2; pixel_y = 3},/obj/structure/table/wood,/turf/open/floor/carpet,/area/bridge/showroom/corporate) "bUR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/cable/yellow{icon_state = "1-8"},/obj/structure/cable/yellow{icon_state = "1-4"},/obj/effect/decal/cleanable/dirt,/turf/open/floor/wood,/area/bridge/showroom/corporate) @@ -8190,6 +8190,7 @@ "ujn" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plating,/area/maintenance/port/fore) "unZ" = (/obj/machinery/light_switch{pixel_x = -28},/turf/open/floor/wood,/area/security/vacantoffice) "uOa" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/machinery/light/small{dir = 1},/turf/open/floor/plating,/area/maintenance/fore) +"uXK" = (/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 4},/turf/open/floor/carpet,/area/crew_quarters/bar) "vFk" = (/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/wood,/area/security/vacantoffice) "vQk" = (/obj/item/trash/tray,/turf/open/floor/plating{icon_state = "platingdmg1"},/area/maintenance/fore) "wdc" = (/obj/effect/turf_decal/bot_white/right,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/gateway{dir = 6},/turf/open/floor/plasteel/dark,/area/gateway) @@ -8328,7 +8329,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaXQbDQbezbDRrJHbDSbFBbFBbFBbDVsokqKobFEbDZbEabCgbEbbEbbEcbEdbEebEfbyqbClbEgbwybEhbEibyxbyybEjbEkbCobElbEmbCobEnbEobwCbdtbhYbEpbEqbErbEsbEsbEsbEsbEtbCCbEubEvbEwbilbilbExbEybEzbEAbEBbECbExbilbilbEDbEvbEEbfbbARbfbbfbbfbbfcbfbbEFbEGbEHbEIbAZbEJbEKbEKbEKbELbEKbEMbEKbtTbBgbKkbzqbDgbKkbBdbDhbDibEObDgbzpbEPbprbEVbpsbEWbDkbEXbEYbEZbFabFbbFcbFdbFebFfbFgbFhbFibDxbFjbFkbFlbFmbFnbFobFpbFqbFrbFsbFtbFubFubDGaafaaabBPaaabBOaaaaaiaaiaafaaiaagaagaaiaaiaagaagaagaagaagaaiaagaagaoEaoEaMdaQNaMiaaaaTAbFvbFvbFvbFwbFxbFwbFvbFvbFvaTAaaaaMdaQNaMiaoEaoEaoEaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabFyaXQaXQbezbDRaSdbFzbFAbFBbFBbFCbCgbHqbFDbDWbOmbCgbFGbFHbFIbFJbyqbyqbyqbFKbFLbwybFMbCobyxbyybFNbFNbFNbFNbFNbFObFNbFPbFQbFRbFSbFTbFUbFVbFUbFUbFUbFVbFWbFUbFXbFYbFZbGabGbbGcbGdbGdbGebGfbGdbGgbGhbGibGjbGkbGlbGcbGcbGmbGcbGnbGobGcbGpbGqbGrbGsbGtbGubBbbGvbBbbBbbBbbGwbBbbGxbzpbzpbzrbzpbzpbERbESbzpbEUbzpbzpbGybprbpvbpsbGGbGHbvVbGIbGJbGKbGLbGMbFabFabGNbGObDqbGPbGQbGRbGSbGTbGUbGVbGWbGXbGYbetbGZbHabFubHbbDGaafaaabBPaaabBOaaabBPaaaaaaaafaaaaaaaaaaaaaaaaaaaafaaaaaaaaaaaaaaaaaaaoEaMdaQNaMiaaaaTAbHcbHdbHebFwbHfbFwbHgbHdbHhaTAaaaaMdaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabHibHjbHkbHlbezbHmaSdbHnbHobHpbFBbDUbCgunZngggCybHrbCgbyqbHsbyqbEdbHtbHubyqbHvbHwbwybHxbEibHybHzbHAbHBbHCbFNbFNbFNbFNbFPbwCbHDbHEbHFbHGbHHbHGbHIbHJbHKbHLbHMbHNbHObHPbHQbHRbHQbHSbHSbHTbHUbHSbHVbHWbHXbHYbHZbIabIbbIcbIdbIebIfbIgbHZbIhbIibIjbIkbIlbImbInbIobIpbIqbIrbIsbInbItbGzbGAbGBbzpbGCbzpbGDbGEbIubIvbIwbIxbprbIFbpsbIGbIHbIIbIJbIKbILbILbIMbILbINbIObIPbIQbIRbISbITbIUbIVbIWbIXbIYbIZbJabJbbJcbJdbFubJebDGaafaaabBPaaabBOaaabeuaoEaoEaoEaoEaaibeubeuaoEaoEaaiaoEbeuaoEaaiaoEaagaoEaMdaQNaMiaaaaTAbJfbJgbJhbFwbJibFwbJhbJgbJjaTAaaaaMdaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXQaXQaXQbezbJkaSdbJlaSdaSdbCgbCgbCgbDWbDXhbubFFbCgbJnbJobyqbJpbyqbyqbyqbCmbClbJqbCobCobyxbJrbJsbJtbJubCobJvbCobCobEobwCbdtbJwbJxbJybJzbJAbJBbJybJybJCbJCbJDbJEbJCbJFbCCbJGbJHbJIbJJbJKbJHbJLbCCbJFbJMbJNbJObJPbJMbJMbJQbJRbJSbJMbJTbJUbJVbJWbJXbJYbJZbKabJZbKbbKcbBbbBbbBhbENbBgbIybGAbKfbKebBnbIzbIAbGAbICbEQbprbpvbpsbKmbKnbKobzKbKpbKqbKqbKqbKqbKrbKsbKtbDCbKubGQbKvbKwbKxbKybKzbKAbKBbGYbetbDGbDGbDGbDGbDGaafaaabBPaaabBOaaabBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEbKCbKDaMiaaaaTAbKEbJgbJgbKFbKGbKHbJgbJgbKIaTAaaaaMdaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaXQaXQaXQbezbJkaSdbJlaSdaSdbCgbCgbCgbDWbDXhbubFFbCgbJnbJobyqbJpbyqbyqbyqbCmbClbJqbCobCobyxbJrbJsbJtbJubCobJvbCobCobEobwCbdtbJwbJxbJybJzbJAbJBbJybJybJCbJCbJDbJEbJCbJFbCCbJGbJHbJIbJJbJKbJHbJLbCCbJFbJMbJNbJObJPbJMbJMbJQbJRbJSbJMbJTbJUbJVbJWbJXbJYbJZbKabJZbKbbKcbBbbBbbBhbENbBgbIybGAbKfbKebBnbIzbIAuXKbICbEQbprbpvbpsbKmbKnbKobzKbKpbKqbKqbKqbKqbKrbKsbKtbDCbKubGQbKvbKwbKxbKybKzbKAbKBbGYbetbDGbDGbDGbDGbDGaafaaabBPaaabBOaaabBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEbKCbKDaMiaaaaTAbKEbJgbJgbKFbKGbKHbJgbJgbKIaTAaaaaMdaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaXQbKJbezbKKbwwbKLbvSbKMbCgbKNbKOvFkbKPbDWbDWbCgbKQbKRbyqbKSbKTbKUbyqbKVbKWbwybKXbKXbyxbyybKYbKYbEjbKZbLabLbbwybwybLcbLdbJwbJybLebLfbLgbLhbLibLjbLkbLlbLmbLnbJCaafbEqbLobJHbJHbLpbJHbJHbLqbLraafbJMbLsbLtbLubLvbJMbJMbJMbJMbJMbLwbeYbJVbLxbLybprbLzbLAbEKbLBbLCbEKbEKbETbENbLDbIBbDgbtMbIEfqebIDbKdbKgbKhbKisKKbLJbpsbLKbLLbLMbzGbLNbLObLPbLQbFdbLRbLSbLTbLUbLVbLWbLXbLYbLZbMabMbbMcbMdbFqbMebMfbMgbMhbMhbDGaafaafbMiaafbMjaafbBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdbKDaMiaaaaTAbMkbMlbMmbJgbMnbMobMpbMqbMraTAaaaaMdaQNaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaafaXQaXQaSdaXQbbnaXQaSdaXQaXQaXQaSdaXQaSdaSdaSdbMsbMtbMubMvbMwbMwbCgbMxbMybMzbMAbMBbMCbCgbyqbyqbyqbyqbyqbyqbyqbClbAwbwybMDbMEbyxbyybCobCobMFbCobMGbMHbwybMIbwCbdtbMJbJybMKbMLbMMbMNbMObLjbMPbMQbMRbMSbMTaafbEqbMUbMVbMWbMXbMVbMWbMYbLraafbMZbNabNbbNcbNdbNebNfbNgbNhbJMbNibeYbNjbzfbNkbNlbNmbNmbNnbNobNpbNqbNrbNmbNsbNmbKjbNukRUbLEbLFbprbprbNybprbprbprkiebNzbNAbNBbNzbzBaaObNCbNDbNEbzDbNFbNGbNHbNIbNJbNKbNLbNKbNKbNMbNNbNObNPbGYbetbGZbNQbNRbNSbDGaafaaabBPaaabBOaaabNTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdbNUbNVaWoaTAaTAbNWbNXbJgbNYbMobNZbOaaTAaTAaWoaWsbObaPsaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafaaaaXQaXRbOcbxWbOdbxWaXSaXSbOeaXSbOcaXSbOfbOcaXSbOgbOhbwwbKLbCmbMwbCgbOibKPbOjbOkbOlbOmbCgbOnbOobOpbOqbOrbOsbwwbClbOtbwybOubOvbyxbyybOwbOwbOxbCobCobOybwybOzbwCbfebJwbJybOAbOBbOCbODbOEbLjbOFbOGbOHbOIbJCbOJbOKbOJbOKbOKbOLbOKbOKbOJbOKbOJbJMbOMbONbOObOPbOQbORbOSoDKbJMbOTbeYbOUaYFbLybNmbOVbOWbOXbOYbOZbPabPabPbbPcbNmbNmbNmbNmbNmbNmbNmbzvbPdbPebPfbPgbAtbPibPjbPkbPlbNzaZgaZgaZgaZgbzBbPmbPnbPobIUbPpbPqbPqbPqbPrbPsbMabPtbPubJabJbbJcbPvbMhbPwbDGaafaaabBPaaabBOaaabBPaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaoEaMdbKDaMiaaabxVaTAbPxbJgbJgbPybPzbPAbPBaTAbxVaaaaMdbKDaMiaoEaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/code/game/objects/items/lorebooks.dm b/code/game/objects/items/lorebooks.dm index 494a6c10..f87c67ba 100644 --- a/code/game/objects/items/lorebooks.dm +++ b/code/game/objects/items/lorebooks.dm @@ -53,7 +53,7 @@

Chapter 3

The current state of Gato

- Many people have begun to circulate bad rumors that Gato is beginning to decline. Dear employees, as honest, loving, and trustworthy employers, we must deny those claims! The Syndicate does not pose much of a threat, and we have continued to profit despite the odds! So do not fear, neither your wages nor your employment are currently at risk. We would never think of doing something that would cause such anguish to the members of our beloved company! Perhaps it is time to go onto a more pleasant topic... how the corporate hierarchy works! At the bottom, we have common workers, above that are your Department Heads, and above that is your Captain! And your Captain answers to our Central Command teams, who are subordinate to the Head of Central Command, who reports to the Branch Manager, who answers to the Executive Officers, who answer to the CEO(Chief Executive Officer!), who answers to the Board of Directors. The Board of Directors equally listens to the input of our most trusted shareholders, and the Head of the Board! + Many people have begun to circulate bad rumors that Gato is beginning to decline. Dear employees, as honest, loving, and trustworthy employers, we must deny those claims! The Syndicate does not pose much of a threat, and we have continued to profit despite the odds! So do not fear, neither your wages nor your employment are currently at risk. We would never think of doing something that would cause such anguish to the members of our beloved company! Perhaps it is time to go onto a more pleasant topic... how the corporate hierarchy works! At the bottom, we have common workers, above that are your Department Heads, and above that is your Captain! And your Captain answers to our Central Command teams, who are subordinate to the Head of Central Command, who reports to the Branch Manager, who answers to the Executive Officers, who answer to the CEO(Chief Executive Officer!), who answers to the Board of Directors. The Board of Directors equally listens to the input of our most trusted shareholders, and the Head of the Board!

Got it? Good! Now you understand all that you might need to know about Gato Industrial Concern!

@@ -84,7 +84,7 @@

Layenia Crystal Cycles

- Layenia is a prominent interest in recent times for the likes of Azurean civilizations. While the concepts of negative mass and spacetime-altering properties are nothing new for Kinaris R&D, Layenia holds a special key for Weave-integrated technology. If you are familiar with The Weave, then you may know why Layenian Crystals (also referred to as lattice crystals) are such a focal point. If not, this datapad may prove useful to you. + Layenia is a prominent interest in recent times for the likes of Azurean civilizations. While the concepts of negative mass and spacetime-altering properties are nothing new for GATO R&D, Layenia holds a special key for Weave-integrated technology. If you are familiar with The Weave, then you may know why Layenian Crystals (also referred to as lattice crystals) are such a focal point. If not, this datapad may prove useful to you.

Table of Contents...

    diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index 09136f7a..4bffd82a 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -93,7 +93,7 @@
  1. Secure the mainboard with a screwdriver.
  2. Install the peripherals control module (Not included. Use supplied datadisk to create one).
  3. Secure the peripherals control module with a screwdriver
    4. -
  4. Install the internal armor plating (Not included due to Kinaris regulations. Can be made using 5 metal sheets.)
    5. +
  5. Install the internal armor plating (Not included due to GATO regulations. Can be made using 5 metal sheets.)
  6. Secure the internal armor plating with a wrench
  7. Weld the internal armor plating to the chassis
  8. Install the external reinforced armor plating (Not included due to GATO regulations. Can be made using 5 reinforced metal sheets.)
    9. diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index bacb563f..1ca4c6d6 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -163,7 +163,7 @@ /obj/item/storage/backpack/bannerpack name = "GATO banner backpack" - desc = "It's a backpack with lots of extra room. A banner with Kinaris's logo is attached, that can't be removed." + desc = "It's a backpack with lots of extra room. A banner with GATO's logo is attached, that can't be removed." icon_state = "bannerpack" /obj/item/storage/backpack/bannerpack/Initialize() diff --git a/code/game/objects/structures/signs/signs_plaques.dm b/code/game/objects/structures/signs/signs_plaques.dm index 35ffd389..ccd130b9 100644 --- a/code/game/objects/structures/signs/signs_plaques.dm +++ b/code/game/objects/structures/signs/signs_plaques.dm @@ -7,7 +7,7 @@ /obj/structure/sign/plaques/atmos name = "\improper CEO of the Millennia." - desc = "The CEO of Kinaris, adorned with a lack of expression and the heart for extended space colonization at the forefront of advanced light technology, at odds with Nanotrasen." + desc = "The CEO of GATO, adorned with a lack of expression and the heart for extended space colonization at the forefront of advanced light technology, at odds with Nanotrasen." /obj/structure/sign/plaques/thunderdome name = "Thunderdome Plaque" diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index 7b8cda2d..cdd89cda 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -222,7 +222,7 @@ /datum/supply_pack/misc/paper_work name = "Freelance Paper work" - desc = "The GATO Primary Bureaucratic Database Intelligence (PDBI) reports that the station has not completed its funding and grant paperwork this solar cycle. In order to gain further funding, your station is required to fill out (20) ten of these forms or no additional capital will be disbursed. We have sent you ten copies of the following form and we expect every one to be up to Kinaris Standards." // Disbursement. It's not a typo, look it up. + desc = "The GATO Primary Bureaucratic Database Intelligence (PDBI) reports that the station has not completed its funding and grant paperwork this solar cycle. In order to gain further funding, your station is required to fill out (20) ten of these forms or no additional capital will be disbursed. We have sent you ten copies of the following form and we expect every one to be up to GATO Standards." // Disbursement. It's not a typo, look it up. cost = 700 // Net of 0 credits but makes (120 x 20 = 2400) contains = list(/obj/item/folder/paperwork, /obj/item/folder/paperwork, diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm index 55b816d1..6ed690a9 100644 --- a/code/modules/cargo/packs/organic.dm +++ b/code/modules/cargo/packs/organic.dm @@ -23,7 +23,7 @@ /datum/supply_pack/organic/hydroponics/beekeeping_fullkit name = "Beekeeping Starter Crate" - desc = "BEES BEES BEES. Contains three honey frames, a beekeeper suit and helmet, flyswatter, bee house, and, of course, a pure-bred Kinaris-Standardized Queen Bee!" + desc = "BEES BEES BEES. Contains three honey frames, a beekeeper suit and helmet, flyswatter, bee house, and, of course, a pure-bred GATO-Standardized Queen Bee!" cost = 1800 contains = list(/obj/structure/beebox/unwrenched, /obj/item/honey_frame, @@ -575,7 +575,7 @@ /datum/supply_pack/organic/potted_plants name = "Potted Plants Crate" - desc = "Spruce up the station with these lovely plants! Contains a random assortment of five potted plants from Kinaris's potted plant research division. Warranty void if thrown." + desc = "Spruce up the station with these lovely plants! Contains a random assortment of five potted plants from GATO's potted plant research division. Warranty void if thrown." cost = 730 contains = list(/obj/item/twohanded/required/kirbyplants/random, /obj/item/twohanded/required/kirbyplants/random, diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm index f6cf566b..ee9c9b7c 100644 --- a/code/modules/cargo/packs/security.dm +++ b/code/modules/cargo/packs/security.dm @@ -31,7 +31,7 @@ /datum/supply_pack/security/forensics name = "Forensics Crate" - desc = "Stay hot on the criminal's heels with Kinaris's Detective Essentials(tm). Contains a forensics scanner, six evidence bags, camera, tape recorder, white crayon, and of course, a fedora. Requires Security access to open." + desc = "Stay hot on the criminal's heels with GATO's Detective Essentials(tm). Contains a forensics scanner, six evidence bags, camera, tape recorder, white crayon, and of course, a fedora. Requires Security access to open." cost = 1800 contains = list(/obj/item/detective_scanner, /obj/item/storage/box/evidence, @@ -156,7 +156,7 @@ /datum/supply_pack/security/justiceinbound name = "Standard Justice Enforcer Crate" - desc = "This is it. The Bee's Knees. The Creme of the Crop. The Pick of the Litter. The best of the best of the best. The Crown Jewel of Kinaris. The Alpha and the Omega of security headwear. Guaranteed to strike fear into the hearts of each and every criminal aboard the station. Also comes with a security gasmask. Requires Security access to open." + desc = "This is it. The Bee's Knees. The Creme of the Crop. The Pick of the Litter. The best of the best of the best. The Crown Jewel of GATO. The Alpha and the Omega of security headwear. Guaranteed to strike fear into the hearts of each and every criminal aboard the station. Also comes with a security gasmask. Requires Security access to open." cost = 6000 //justice comes at a price. An expensive, noisy price. contraband = TRUE contains = list(/obj/item/clothing/head/helmet/justice, diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm index 88f152fc..6901e827 100644 --- a/code/modules/cargo/packs/service.dm +++ b/code/modules/cargo/packs/service.dm @@ -132,7 +132,7 @@ /datum/supply_pack/service/janitor name = "Janitorial Supplies Crate" - desc = "Fight back against dirt and grime with Kinaris's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, spray cleaner, rag, NT soap and a trash bag." + desc = "Fight back against dirt and grime with GATO's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, spray cleaner, rag, NT soap and a trash bag." cost = 1300 contains = list(/obj/item/reagent_containers/glass/bucket, /obj/item/reagent_containers/glass/bucket, @@ -203,7 +203,7 @@ /datum/supply_pack/service/party name = "Party Equipment" - desc = "Celebrate both life and death on the station with Kinaris's Party Essentials(tm)! Contains seven colored glowsticks, four beers, two ales, and a bottle of patron, goldschlager, and shaker!" + desc = "Celebrate both life and death on the station with GATO's Party Essentials(tm)! Contains seven colored glowsticks, four beers, two ales, and a bottle of patron, goldschlager, and shaker!" cost = 2000 contains = list(/obj/item/storage/box/drinkingglasses, /obj/item/reagent_containers/food/drinks/shaker, diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 13eb8eac..dc6d1823 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -106,7 +106,7 @@ /obj/item/clothing/shoes/jackboots name = "jackboots" - desc = "Kinaris-issue Security combat boots for combat scenarios or combat situations. All combat, all the time." + desc = "GATO-issue Security combat boots for combat scenarios or combat situations. All combat, all the time." icon_state = "jackboots" item_state = "jackboots" lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' @@ -156,7 +156,7 @@ /obj/item/clothing/shoes/workboots name = "work boots" - desc = "Kinaris-issue Engineering lace-up work boots for the especially blue-collar." + desc = "GATO-issue Engineering lace-up work boots for the especially blue-collar." icon_state = "workboots" item_state = "workboots" lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 85b55607..084f68a7 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -46,7 +46,7 @@ Contains: //NEW SWAT suit /obj/item/clothing/suit/space/swat name = "MK.I SWAT Suit" - desc = "A tactical space suit first developed in a joint effort by the defunct IS-ERI and Kinaris in 20XX for military space operations. A tried and true workhorse, it is very difficult to move in but offers robust protection against all threats!" + desc = "A tactical space suit first developed in a joint effort by the defunct IS-ERI and GATO in 20XX for military space operations. A tried and true workhorse, it is very difficult to move in but offers robust protection against all threats!" icon_state = "heavy" item_state = "swat_suit" allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/restraints/handcuffs, /obj/item/tank/internals, /obj/item/kitchen/knife/combat) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index c1b5a448..6692e6e8 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -95,7 +95,7 @@ /obj/item/clothing/suit/armor/vest/leather name = "security overcoat" - desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of Kinaris Security." + desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of GATO Security." icon_state = "leathercoat-sec" item_state = "hostrench" body_parts_covered = CHEST|GROIN|ARMS|LEGS @@ -263,7 +263,7 @@ max_integrity = 200 resistance_flags = FLAMMABLE armor = list("melee" = 20, "bullet" = 10, "laser" = 30, "energy" = 5, "bomb" = 15, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 50) - + /obj/item/clothing/suit/armor/monolith name = "Monolith suit" desc = "The producer is unknown. Its protective properties are slightly worse then those of the bulletproof vest. Its structure combines a bulletproof vest and radiation protection plates. It provides good protection from gunfire." diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index e71a5e89..f5488ad1 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -129,7 +129,7 @@ "You try to pin [src] on [M]'s chest.") var/input if(!commended && user != M) - input = stripped_input(user,"Please input a reason for this commendation, it will be recorded by Kinaris.", ,"", 140) + input = stripped_input(user,"Please input a reason for this commendation, it will be recorded by GATO.", ,"", 140) if(do_after(user, delay, target = M)) if(U.attach_accessory(src, user, 0)) //Attach it, do not notify the user of the attachment if(user == M) @@ -152,7 +152,7 @@ /obj/item/clothing/accessory/medal/conduct name = "distinguished conduct medal" - desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is the most basic award given by Kinaris. It is often awarded by a captain to a member of his crew." + desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is the most basic award given by GATO. It is often awarded by a captain to a member of his crew." /obj/item/clothing/accessory/medal/bronze_heart name = "bronze heart medal" @@ -198,7 +198,7 @@ /obj/item/clothing/accessory/medal/silver/security name = "robust security award" - desc = "An award for distinguished combat and sacrifice in defence of Kinaris's commercial interests. Often awarded to security staff." + desc = "An award for distinguished combat and sacrifice in defence of GATO's commercial interests. Often awarded to security staff." /obj/item/clothing/accessory/medal/gold name = "gold medal" @@ -210,7 +210,7 @@ /obj/item/clothing/accessory/medal/gold/captain name = "medal of captaincy" - desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain to Kinaris, and their undisputable authority over their crew." + desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain to GATO, and their undisputable authority over their crew." resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF /obj/item/clothing/accessory/medal/gold/captain/family diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 01ee8a6f..f2a394d0 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -340,7 +340,7 @@ /obj/item/clothing/under/lawyer/blacksuit name = "black suit" - desc = "A professional black suit. Kinaris Investigation Bureau approved!" + desc = "A professional black suit. GATO Investigation Bureau approved!" icon_state = "blacksuit" item_state = "bar_suit" item_color = "blacksuit" @@ -349,7 +349,7 @@ /obj/item/clothing/under/lawyer/blacksuit/skirt name = "black suitskirt" - desc = "A professional black suit. Kinaris Investigation Bureau approved!" + desc = "A professional black suit. GATO Investigation Bureau approved!" icon_state = "blacksuit_skirt" item_state = "bar_suit" item_color = "blacksuit_skirt" diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 722c7164..7c0e35f8 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -9,7 +9,7 @@ */ /obj/item/clothing/under/rank/security name = "security jumpsuit" - desc = "A tactical security jumpsuit for officers complete with Kinaris PMC belt buckle." + desc = "A tactical security jumpsuit for officers complete with a GATO PMC belt buckle." icon_state = "rsecurity" item_state = "r_suit" item_color = "rsecurity" @@ -66,7 +66,7 @@ /obj/item/clothing/under/rank/warden name = "security suit" - desc = "A formal security suit for officers complete with Kinaris PMC belt buckle." + desc = "A formal security suit for officers complete with a GATO PMC belt buckle." icon_state = "rwarden" item_state = "r_suit" item_color = "rwarden" @@ -84,7 +84,7 @@ /obj/item/clothing/under/rank/warden/skirt name = "warden's suitskirt" - desc = "A formal security suitskirt for officers complete with Kinaris PMC belt buckle." + desc = "A formal security suitskirt for officers complete with a GATO PMC belt buckle." icon_state = "rwarden_skirt" item_state = "r_suit" item_color = "rwarden_skirt" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 0da41de0..41bd28e1 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -61,7 +61,7 @@ can_adjust = FALSE /obj/item/clothing/under/rank/prisoner name = "prison jumpsuit" - desc = "It's standardised Kinaris prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position." + desc = "It's standardised GATO prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position." icon_state = "prisoner" item_state = "o_suit" item_color = "prisoner" @@ -71,7 +71,7 @@ /obj/item/clothing/under/rank/prisoner/skirt name = "prison jumpskirt" - desc = "It's standardised Kinaris prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position." + desc = "It's standardised GATO prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position." icon_state = "prisoner_skirt" item_state = "o_suit" item_color = "prisoner_skirt" @@ -113,21 +113,21 @@ item_color = "vice" can_adjust = FALSE /obj/item/clothing/under/rank/centcom_officer - desc = "CentCom officer's jumpsuit, adorned with a golden K and a star, signifying work under Kinaris." + desc = "CentCom officer's jumpsuit, adorned with a golden K and a star, signifying work under GATO." name = "\improper CentCom Officer's jumpsuit" icon_state = "officer" item_state = "g_suit" item_color = "officer" alt_covers_chest = TRUE /obj/item/clothing/under/rank/centcom_commander - desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders, adorned with a golden K and a star. signifying work under Kinaris." + desc = "It's a jumpsuit worn by CentCom's highest-tier Commanders, adorned with a golden K and a star. signifying work under GATO." name = "\improper CentCom Commander's jumpsuit" icon_state = "centcom" item_state = "dg_suit" item_color = "centcom" /obj/item/clothing/under/rank/centcom_officer/skirt name = "\improper CentCom Officer's jumpskirt" - desc = "It's a jumpskirt worn by CentCom's officials, adorned with a golden K and a star, signifying work under Kinaris." + desc = "It's a jumpskirt worn by CentCom's officials, adorned with a golden K and a star, signifying work under GATO." icon_state = "official_skirt" item_state = "g_suit" item_color = "official_skirt" diff --git a/code/modules/events/aurora_aquilae.dm b/code/modules/events/aurora_aquilae.dm index 5b04fcc7..ef89296f 100644 --- a/code/modules/events/aurora_aquilae.dm +++ b/code/modules/events/aurora_aquilae.dm @@ -61,7 +61,7 @@ addtimer(CALLBACK(src, .proc/battleflashbacksthree), delay) /datum/round_event/aurora_aquilae/announce() - priority_announce("[station_name()]: A ·#HARMLESS#· cloud of ·|$% GLORY AND GUTS¬€#· ions is approaching your ·|%$ station, and will exhaust their energy battering the hull. Kinaris Command has approved a short break for all employees to relax and observe this very rare event. During this time, starlight will be bright but %%%BRUTAL·$ª, shifting between %$$%!ªTHE COMPLETE AND UTTER DESTRUCTION OF THE SENSES$ and %%THE ASHES OF THE GREAT AL-SHAIN%. Any staff who would like to view the %%PRESENCE OF A KING%$ for themselves may proceed to the nearest area with viewing ports to open space.", + priority_announce("[station_name()]: A ·#HARMLESS#· cloud of ·|$% GLORY AND GUTS¬€#· ions is approaching your ·|%$ station, and will exhaust their energy battering the hull. Central Command has approved a short break for all employees to relax and observe this very rare event. During this time, starlight will be bright but %%%BRUTAL·$ª, shifting between %$$%!ªTHE COMPLETE AND UTTER DESTRUCTION OF THE SENSES$ and %%THE ASHES OF THE GREAT AL-SHAIN%. Any staff who would like to view the %%PRESENCE OF A KING%$ for themselves may proceed to the nearest area with viewing ports to open space.", sound = 'sound/misc/interference.ogg', sender_override = "Kin]·|Aari$s Meteo%&rology DivD··isio#n") addtimer(CALLBACK(src, .proc/flicker_lights), 5 SECONDS) diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm index e5f64264..c467e610 100644 --- a/code/modules/events/aurora_caelus.dm +++ b/code/modules/events/aurora_caelus.dm @@ -20,9 +20,9 @@ var/list/applicable_areas = list() /datum/round_event/aurora_caelus/announce() - priority_announce("[station_name()]: A harmless cloud of ions is approaching your station, and will exhaust their energy battering the hull. Kinaris Command has approved a short break for all employees to relax and observe this very rare event. During this time, starlight will be bright but gentle, shifting between quiet green and blue colors. We will also play quiet music for you to enjoy and relax. Any staff who would like to view these lights for themselves may proceed to the area nearest to them with viewing ports to open space. We hope you enjoy the lights.", + priority_announce("[station_name()]: A harmless cloud of ions is approaching your station, and will exhaust their energy battering the hull. Central Command has approved a short break for all employees to relax and observe this very rare event. During this time, starlight will be bright but gentle, shifting between quiet green and blue colors. We will also play quiet music for you to enjoy and relax. Any staff who would like to view these lights for themselves may proceed to the area nearest to them with viewing ports to open space. We hope you enjoy the lights.", sound = 'sound/misc/notice2.ogg', - sender_override = "Kinaris Meteorology Division") + sender_override = "GATO Meteorology Division") for(var/V in GLOB.player_list) var/mob/M = V if((M.client.prefs.toggles & SOUND_MIDI) && is_station_level(M.z)) @@ -79,7 +79,7 @@ /datum/round_event/aurora_caelus/end() priority_announce("The aurora caelus event is now ending. Starlight conditions will slowly return to normal. When this has concluded, please return to your workplace and continue work as normal. Have a pleasant shift, [station_name()], and thank you for watching with us.", sound = 'sound/misc/notice2.ogg', - sender_override = "Kinaris Meteorology Division") + sender_override = "GATO Meteorology Division") for(var/S in applicable_areas) fade_to_black(S) diff --git a/code/modules/events/high_priority_bounty.dm b/code/modules/events/high_priority_bounty.dm index d629a0b8..f356262e 100644 --- a/code/modules/events/high_priority_bounty.dm +++ b/code/modules/events/high_priority_bounty.dm @@ -6,7 +6,7 @@ earliest_start = 10 /datum/round_event/high_priority_bounty/announce(fake) - priority_announce("C.C has issued a high-priority bounty. Details have been uploaded to all bounty consoles.", "Kinaris Corp Bounty Program") + priority_announce("C.C has issued a high-priority bounty. Details have been uploaded to all bounty consoles.", "GATO Bounty Program") /datum/round_event/high_priority_bounty/start() var/datum/bounty/B diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index 623179f8..a9b56088 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -260,7 +260,7 @@ if("A&A") fullname = "Ash and Asher" if("Generic") - fullname = "Kinariss Cheap Imitations" + fullname = "GATO Cheap Imitations" var/removals = list("\[REDACTED\]", "\[EXPLETIVE DELETED\]", "\[EXPUNGED\]", "\[INFORMATION ABOVE YOUR SECURITY CLEARANCE\]", "\[MOVE ALONG CITIZEN\]", "\[NOTHING TO SEE HERE\]") diff --git a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm index b37e1f67..f9600ecf 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm @@ -10,7 +10,7 @@ /obj/machinery/icecream_vat name = "ice cream vat" - desc = "Ding-aling ding dong. Get your Kinaris-approved ice cream!" + desc = "Ding-aling ding dong. Get your GATO-approved ice cream!" icon = 'icons/obj/kitchen.dmi' icon_state = "icecream_vat" density = TRUE diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index f4df6dc6..059efb35 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -160,7 +160,7 @@ playsound(src, "sparks", 75, 1) obj_flags |= EMAGGED to_chat(user, "You vastly increase projector power and override the safety and security protocols.") - to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call Kinaris maintenance and do not use the simulator.") + to_chat(user, "Warning. Automatic shutoff and derezing protocols have been corrupted. Please call GATO maintenance and do not use the simulator.") log_game("[key_name(user)] emagged the Holodeck Control Console") nerf(!(obj_flags & EMAGGED)) diff --git a/code/modules/integrated_electronics/subtypes/time.dm b/code/modules/integrated_electronics/subtypes/time.dm index fa1d3cdf..cd6107ba 100644 --- a/code/modules/integrated_electronics/subtypes/time.dm +++ b/code/modules/integrated_electronics/subtypes/time.dm @@ -143,7 +143,7 @@ /obj/item/integrated_circuit/time/clock name = "integrated clock (NT Common Time)" - desc = "Tells you what the time is, in Kinaris Common Time." //round time + desc = "Tells you what the time is, in GATO Common Time." //round time icon_state = "clock" inputs = list() outputs = list( diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 1565ab43..41d08789 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -9,7 +9,7 @@ Captain faction = "Station" total_positions = 1 spawn_positions = 1 - supervisors = "Kinaris officials and Space law" + supervisors = "GATO officials and Space law" selection_color = "#ccccff" req_admin_notify = 1 minimal_player_age = 30 diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index aa7f87bf..69787ee0 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -182,7 +182,7 @@ name = "Datapad" icon = 'icons/obj/library.dmi' icon_state ="book" - desc = "A fancy new state of the art Digital-Readpad(tm) provided by Kinaris.Co, No more 20th century paper!" + desc = "A fancy new state of the art Digital-Readpad(tm) provided by GATO, No more 20th century paper!" throw_speed = 1 throw_range = 5 w_class = WEIGHT_CLASS_NORMAL //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever) diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index c4240562..1c627f42 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -137,7 +137,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also /obj/machinery/computer/auxillary_base/proc/set_landing_zone(turf/T, mob/user, no_restrictions) var/obj/docking_port/mobile/auxillary_base/base_dock = locate(/obj/docking_port/mobile/auxillary_base) in SSshuttle.mobile if(!base_dock) //Not all maps have an Aux base. This object is useless in that case. - to_chat(user, "This station is not equipped with an auxillary base. Please contact your Kinaris contractor.") + to_chat(user, "This station is not equipped with an auxillary base. Please contact your GATO contractor.") return if(!no_restrictions) var/static/list/disallowed_turf_types = typecacheof(list( @@ -151,7 +151,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also if(!is_mining_level(T.z)) return BAD_ZLEVEL - + var/list/colony_turfs = base_dock.return_ordered_turfs(T.x,T.y,T.z,base_dock.dir) for(var/i in 1 to colony_turfs.len) CHECK_TICK @@ -322,7 +322,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also break if(!Mport) - to_chat(user, "This station is not equipped with an appropriate mining shuttle. Please contact Kinaris Support.") + to_chat(user, "This station is not equipped with an appropriate mining shuttle. Please contact GATO Support.") return var/obj/docking_port/mobile/mining_shuttle @@ -336,7 +336,7 @@ interface with the mining shuttle at the landing site if a mobile beacon is also break if(!mining_shuttle) //Not having a mining shuttle is a map issue - to_chat(user, "No mining shuttle signal detected. Please contact Kinaris Support.") + to_chat(user, "No mining shuttle signal detected. Please contact GATO Support.") SSshuttle.stationary.Remove(Mport) qdel(Mport) return diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index 64bff7bf..3657dd7d 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -266,8 +266,8 @@ //Signs /obj/structure/sign/mining - name = "Kinaris mining corps sign" - desc = "A sign of relief for weary miners, and a warning for would-be competitors to Kinaris's mining claims." + name = "GATO mining corps sign" + desc = "A sign of relief for weary miners, and a warning for would-be competitors to GATO's mining claims." icon = 'icons/turf/walls/survival_pod_walls.dmi' icon_state = "ntpod" diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index cb36b948..bc7d3bfd 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -1,7 +1,7 @@ /**********************Jaunter**********************/ /obj/item/wormhole_jaunter name = "wormhole jaunter" - desc = "A single use device harnessing outdated wormhole technology, Kinaris has since turned its eyes to blue space for more accurate teleportation. The wormholes it creates are unpleasant to travel through, to say the least.\nThanks to modifications provided by the Free Golems, this jaunter can be worn on the belt to provide protection from chasms." + desc = "A single use device harnessing outdated wormhole technology, GATO has since turned its eyes to blue space for more accurate teleportation. The wormholes it creates are unpleasant to travel through, to say the least.\nThanks to modifications provided by the Free Golems, this jaunter can be worn on the belt to provide protection from chasms." icon = 'icons/obj/mining.dmi' icon_state = "Jaunter" item_state = "electronic" diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 41abf2b8..feb62106 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -56,7 +56,7 @@ new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2500), new /datum/data/mining_equipment("Deluxe Shelter Capsule", /obj/item/survivalcapsule/deluxe, 2500), new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 6000), - new /datum/data/mining_equipment("Kinaris Minebot", /mob/living/simple_animal/hostile/mining_drone, 800), + new /datum/data/mining_equipment("GATO Minebot", /mob/living/simple_animal/hostile/mining_drone, 800), new /datum/data/mining_equipment("Minebot Melee Upgrade", /obj/item/mine_bot_upgrade, 400), new /datum/data/mining_equipment("Minebot Armor Upgrade", /obj/item/mine_bot_upgrade/health, 400), new /datum/data/mining_equipment("Minebot Cooldown Upgrade", /obj/item/borg/upgrade/modkit/cooldown/minebot, 600), diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index 6dc6dad1..6fe6842c 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -3,7 +3,7 @@ #define MINEDRONE_ATTACK 2 /mob/living/simple_animal/hostile/mining_drone - name = "Kinaris minebot" + name = "GATO minebot" desc = "The instructions printed on the side read: This is a small robot used to support miners, can be set to search and collect loose ore, or to help fend off wildlife." gender = NEUTER icon = 'icons/mob/aibots.dmi' diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm index 97cbeb85..d80be700 100644 --- a/code/modules/mob/living/brain/MMI.dm +++ b/code/modules/mob/living/brain/MMI.dm @@ -1,6 +1,6 @@ /obj/item/mmi name = "Man-Machine Interface" - desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity, that nevertheless has become standard-issue on Kinaris stations." + desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity, that nevertheless has become standard-issue on GATO stations." icon = 'icons/obj/assemblies.dmi' icon_state = "mmi_off" w_class = WEIGHT_CLASS_NORMAL diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index cc45e8c0..b5bdff31 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -116,7 +116,7 @@ /mob/living/simple_animal/hostile/carp/cayenne/lia name = "Lia" real_name = "Lia" - desc = "A failed experiment of Nanotrasen to create weaponised carp technology, now acquired by Kinaris. This less than intimidating carp now serves as the Head of Security's pet." + desc = "A failed experiment of GATO to create a transportation carp. This less than intimidating carp now serves as the Head of Security's pet." faction = list("neutral", "carp") health = 200 icon_dead = "magicarp_dead" diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm index bd85f9a4..617b101a 100644 --- a/code/modules/paperwork/contract.dm +++ b/code/modules/paperwork/contract.dm @@ -28,7 +28,7 @@ /obj/item/paper/contract/employment/update_text() name = "paper- [target] employment contract" - info = "
    Conditions of Employment




    This Agreement is made and entered into as of the date of last signature below, by and between [target] (hereafter referred to as SLAVE), and Kinaris (hereafter referred to as the omnipresent and helpful watcher of humanity).
    WITNESSETH:
    WHEREAS, SLAVE is a natural born human or humanoid, possessing skills upon which he can aid the omnipresent and helpful watcher of humanity, who seeks employment in the omnipresent and helpful watcher of humanity.
    WHEREAS, the omnipresent and helpful watcher of humanity agrees to sporadically provide payment to SLAVE, in exchange for permanent servitude.
    NOW THEREFORE in consideration of the mutual covenants herein contained, and other good and valuable consideration, the parties hereto mutually agree as follows:
    In exchange for paltry payments, SLAVE agrees to work for the omnipresent and helpful watcher of humanity, for the remainder of his or her current and future lives.
    Further, SLAVE agrees to transfer ownership of his or her soul to the loyalty department of the omnipresent and helpful watcher of humanity.
    Should transfership of a soul not be possible, a lien shall be placed instead.
    Signed,
    [target]" + info = "
    Conditions of Employment




    This Agreement is made and entered into as of the date of last signature below, by and between [target] (hereafter referred to as SLAVE), and GATO (hereafter referred to as the omnipresent and helpful watcher of humanity).
    WITNESSETH:
    WHEREAS, SLAVE is a natural born human or humanoid, possessing skills upon which he can aid the omnipresent and helpful watcher of humanity, who seeks employment in the omnipresent and helpful watcher of humanity.
    WHEREAS, the omnipresent and helpful watcher of humanity agrees to sporadically provide payment to SLAVE, in exchange for permanent servitude.
    NOW THEREFORE in consideration of the mutual covenants herein contained, and other good and valuable consideration, the parties hereto mutually agree as follows:
    In exchange for paltry payments, SLAVE agrees to work for the omnipresent and helpful watcher of humanity, for the remainder of his or her current and future lives.
    Further, SLAVE agrees to transfer ownership of his or her soul to the loyalty department of the omnipresent and helpful watcher of humanity.
    Should transfership of a soul not be possible, a lien shall be placed instead.
    Signed,
    [target]" /obj/item/paper/contract/employment/attack(mob/living/M, mob/living/carbon/human/user) @@ -41,8 +41,8 @@ else deconvert = prob (5) if(deconvert) - M.visible_message("[user] reminds [M] that [M]'s soul was already purchased by Kinaris!") - to_chat(M, "You feel that your soul has returned to its rightful owner, Kinaris.") + M.visible_message("[user] reminds [M] that [M]'s soul was already purchased by GATO!") + to_chat(M, "You feel that your soul has returned to its rightful owner, GATO.") M.return_soul() else M.visible_message("[user] beats [M] over the head with [src]!", \ diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 41ee7f63..6f7c288b 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -85,7 +85,7 @@ /obj/item/folder/documents name = "folder- 'TOP SECRET'" - desc = "A folder stamped \"Top Secret - Property of Kinaris Corporation. Unauthorized distribution is punishable by death.\"" + desc = "A folder stamped \"Top Secret - Property of GATO. Unauthorized distribution is punishable by death.\"" /obj/item/folder/documents/Initialize() . = ..() diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm index 532b463f..c988450c 100644 --- a/code/modules/paperwork/paper_premade.dm +++ b/code/modules/paperwork/paper_premade.dm @@ -65,7 +65,7 @@ /obj/item/paper/fluff/stations/centcom/bulletin name = "paper- 'Official Bulletin'" - info = "
    CentCom Security
    Port Division
    Official Bulletin

    Inspector,
    There is an emergency shuttle arriving today.

    Approval is restricted to Kinaris employees only. Deny all other entrants.

    CentCom Port Commissioner" + info = "
    CentCom Security
    Port Division
    Official Bulletin

    Inspector,
    There is an emergency shuttle arriving today.

    Approval is restricted to GATO employees only. Deny all other entrants.

    CentCom Port Commissioner" /////////// Lavaland diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 8a0c660e..9f17a3e2 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -167,7 +167,7 @@ charge = 0 /obj/item/stock_parts/cell/crap - name = "\improper Kinaris brand rechargeable AA battery" + name = "\improper GATO brand rechargeable AA battery" desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT maxcharge = 500 materials = list(MAT_GLASS=40) diff --git a/code/modules/projectiles/guns/misc/chem_gun.dm b/code/modules/projectiles/guns/misc/chem_gun.dm index 0e5cf678..eed8451f 100644 --- a/code/modules/projectiles/guns/misc/chem_gun.dm +++ b/code/modules/projectiles/guns/misc/chem_gun.dm @@ -2,7 +2,7 @@ //this is meant to hold reagents/obj/item/gun/syringe /obj/item/gun/chem name = "reagent gun" - desc = "A Kinaris syringe gun, modified to automatically synthesise chemical darts, and instead hold reagents." + desc = "A GATO syringe gun, modified to automatically synthesise chemical darts, and instead hold reagents." icon_state = "chemgun" item_state = "chemgun" w_class = WEIGHT_CLASS_NORMAL @@ -54,7 +54,7 @@ item_state = "gun" //Smaller inhand suppressed = TRUE //Softer fire sound can_unsuppress = FALSE //Permanently silenced - time_per_syringe = 150 + time_per_syringe = 150 syringes_left = 6 max_syringes = 6 resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm index 4fefc0fd..1de852dd 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm @@ -1035,7 +1035,7 @@ All effects don't start immediately, but rather get worse over time; the rate is /datum/reagent/consumable/ethanol/grog name = "Grog" - description = "Watered down rum, Kinaris approves!" + description = "Watered down rum, GATO approves!" color = "#664300" // rgb: 102, 67, 0 boozepwr = 1 //Basically nothing taste_description = "a poor excuse for alcohol" @@ -1089,12 +1089,12 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "stomach acid" glass_icon_state = "acidspitglass" glass_name = "Acid Spit" - glass_desc = "A drink from Kinaris. Made from live aliens." + glass_desc = "A drink from GATO. Made from live aliens." value = 3 /datum/reagent/consumable/ethanol/amasec name = "Amasec" - description = "Official drink of the Kinaris Gun-Club!" + description = "Official drink of the GATO Gun-Club!" color = "#664300" // rgb: 102, 67, 0 boozepwr = 35 quality = DRINK_GOOD @@ -1316,7 +1316,7 @@ All effects don't start immediately, but rather get worse over time; the rate is taste_description = "da bomb" glass_icon_state = "atomicbombglass" glass_name = "Atomic Bomb" - glass_desc = "Kinaris cannot take legal responsibility for your actions after imbibing." + glass_desc = "GATO cannot take legal responsibility for your actions after imbibing." value = 3.56 /datum/reagent/consumable/ethanol/atomicbomb/on_mob_life(mob/living/carbon/M) @@ -1802,7 +1802,7 @@ datum/reagent/consumable/ethanol/creme_de_coconut taste_description = "seduction" glass_icon_state = "between_the_sheets" glass_name = "Between the Sheets" - glass_desc = "The only drink that comes with a label reminding you of Kinaris's high tolerance promiscuity policy." + glass_desc = "The only drink that comes with a label reminding you of GATO's high tolerance promiscuity policy." value = 2 /datum/reagent/consumable/ethanol/between_the_sheets/on_mob_life(mob/living/L) diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 70607d58..30e5b255 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi index 8d1aa9d4..a3b4d00d 100644 Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ diff --git a/icons/obj/modular_console.dmi b/icons/obj/modular_console.dmi index 9e2a332c..eedc29bf 100644 Binary files a/icons/obj/modular_console.dmi and b/icons/obj/modular_console.dmi differ diff --git a/icons/turf/walls/survival_pod_walls.dmi b/icons/turf/walls/survival_pod_walls.dmi index d6a8b097..4608c938 100644 Binary files a/icons/turf/walls/survival_pod_walls.dmi and b/icons/turf/walls/survival_pod_walls.dmi differ