diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm index 1453317589b..e2db6d722f8 100644 --- a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm +++ b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm @@ -27,7 +27,7 @@ "aA" = (/obj/machinery/light{dir = 1},/obj/item/aiModule/reset/purge,/obj/structure/table/reinforced,/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) "aB" = (/obj/structure/chair/comfy/black,/turf/open/floor/carpet/royalblack,/area/ruin/space/has_grav/syndicate_forgotten_ship) "aC" = (/obj/machinery/light,/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_ship) -"aD" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer1,/obj/machinery/portable_atmospherics/scrubber,/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) +"aD" = (/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer1,/obj/machinery/portable_atmospherics/scrubber{anchored = 1},/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) "aE" = (/obj/structure/closet/syndicate{anchored = 1; armor = list("melee" = 70, "bullet" = 40, "laser" = 40, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 60); desc = "A basic closet for all your villainous needs."; locked = 1; name = "Closet"; req_one_access_txt = "150"; secure = 1},/obj/effect/spawner/lootdrop/armory_contraband/metastation,/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) "aF" = (/obj/machinery/light{dir = 4},/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_ship) "aG" = (/obj/machinery/turretid{control_area = "/area/ruin/space/has_grav/syndicate_forgotten_ship"; enabled = 0; icon_state = "control_kill"; lethal = 1; name = "Ship turret control panel"; req_access = null; req_one_access_txt = "150"; step_y = 32},/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) @@ -49,11 +49,11 @@ "aW" = (/obj/structure/table/reinforced,/obj/item/toy/plush/nukeplushie,/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) "aX" = (/obj/machinery/light{dir = 1},/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_cargopod) "aY" = (/turf/closed/mineral/random,/area/space) -"aZ" = (/turf/closed/mineral/uranium,/area/space) +"aZ" = (/turf/closed/indestructible/syndicate,/area/ruin/space/has_grav/powered/syndicate_forgotten_vault) "ba" = (/obj/structure/lattice/catwalk,/obj/structure/cable,/turf/open/space/basic,/area/space) "bb" = (/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/syndicate_forgotten_cargopod) "bc" = (/obj/machinery/light,/mob/living/simple_animal/hostile/nanotrasen/ranged/assault,/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) -"bd" = (/obj/structure/closet/crate/secure/gear{req_one_access_txt = "150"},/obj/item/codespeak_manual/unlimited,/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_cargopod) +"bd" = (/obj/structure/closet/crate/secure/gear{req_one_access_txt = "150"},/obj/item/stack/sheet/metal/fifty,/obj/item/stack/sheet/plasteel/twenty,/obj/item/stack/sheet/mineral/plastitanium{amount = 50},/obj/item/stack/sheet/glass/fifty,/obj/item/stack/rods/fifty,/turf/open/floor/pod/dark,/area/ruin/space/has_grav/powered/syndicate_forgotten_vault) "be" = (/obj/structure/cable,/obj/machinery/door/airlock/external{name = "Syndicate ship airlock"; req_one_access_txt = "150"},/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_ship) "bf" = (/obj/machinery/power/apc/syndicate{dir = 1; name = "Syndicate Cargo Pod APC"; pixel_y = 32; start_charge = 0; step_y = 0},/obj/structure/cable,/obj/structure/closet/crate/secure/gear{req_one_access_txt = "150"},/obj/item/circuitboard/machine/circuit_imprinter,/obj/item/circuitboard/machine/protolathe,/obj/item/stack/sheet/metal/twenty,/obj/item/stack/sheet/glass{amount = 10},/obj/item/stack/cable_coil,/obj/item/circuitboard/computer/rdconsole,/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_cargopod) "bg" = (/obj/structure/sign/poster/contraband/syndicate_pistol,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/syndicate_forgotten_ship) @@ -76,6 +76,8 @@ "bx" = (/obj/machinery/door/airlock/grunge{name = "Captain's room"; req_one_access_txt = "150"},/obj/machinery/door/poddoor{id = "fscaproom"; name = "Captain's blast door"; state_open = 1},/turf/open/floor/carpet/royalblack,/area/ruin/space/has_grav/syndicate_forgotten_ship) "by" = (/obj/machinery/door/airlock/grunge{name = "Syndicate Ship Airlock"; req_one_access_txt = "150"},/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_ship) "bz" = (/obj/structure/table/reinforced,/obj/item/assembly/prox_sensor,/obj/item/assembly/prox_sensor,/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_ship) +"bA" = (/obj/structure/closet/crate/secure/gear{req_one_access_txt = "150"},/obj/item/clothing/suit/space/hardsuit/cybersun,/turf/open/floor/pod/dark,/area/ruin/space/has_grav/powered/syndicate_forgotten_vault) +"bB" = (/obj/structure/closet/crate/secure/gear{req_one_access_txt = "150"},/obj/item/melee/transforming/energy/sword/saber/red,/turf/open/floor/pod/dark,/area/ruin/space/has_grav/powered/syndicate_forgotten_vault) "bC" = (/obj/structure/closet/crate/medical,/obj/item/stack/medical/bruise_pack{amount = 12},/obj/item/stack/medical/ointment{amount = 12},/obj/item/healthanalyzer/advanced,/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_cargopod) "bD" = (/obj/structure/chair/comfy{dir = 1},/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_ship) "bE" = (/obj/effect/mob_spawn/human/syndicatespace,/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_ship) @@ -155,52 +157,56 @@ "da" = (/obj/structure/table/reinforced,/obj/item/ammo_box/c10mm,/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_ship) "db" = (/obj/structure/toilet{dir = 1},/obj/machinery/light,/turf/open/floor/plasteel,/area/ruin/space/has_grav/syndicate_forgotten_ship) "dc" = (/obj/machinery/shower{icon_state = "shower"; dir = 1},/obj/machinery/light,/turf/open/floor/plasteel,/area/ruin/space/has_grav/syndicate_forgotten_ship) +"dd" = (/obj/structure/closet/crate/secure/gear{req_one_access_txt = "150"},/obj/item/codespeak_manual/unlimited,/turf/open/floor/pod/dark,/area/ruin/space/has_grav/powered/syndicate_forgotten_vault) +"de" = (/turf/open/floor/pod/dark,/area/ruin/space/has_grav/powered/syndicate_forgotten_vault) "df" = (/obj/structure/closet/syndicate{anchored = 1; armor = list("melee" = 70, "bullet" = 40, "laser" = 40, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 60); desc = "A basic closet for all your villainous needs."; locked = 1; name = "Closet"; req_one_access_txt = "150"; secure = 1},/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/gloves/combat,/obj/item/clothing/shoes/combat,/obj/item/clothing/mask/gas/syndicate,/obj/item/clothing/under/syndicate/skirt,/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) "dg" = (/obj/structure/closet/syndicate{anchored = 1; armor = list("melee" = 70, "bullet" = 40, "laser" = 40, "energy" = 30, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 60); desc = "A basic closet for all your villainous needs."; locked = 1; name = "Closet"; req_one_access_txt = "150"; secure = 1},/obj/item/clothing/head/HoS/beret/syndicate,/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,/obj/item/clothing/mask/gas/syndicate,/obj/item/clothing/under/syndicate,/obj/item/clothing/under/syndicate/skirt,/obj/item/clothing/gloves/combat,/obj/item/clothing/shoes/combat,/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) "dh" = (/obj/machinery/camera/xray{c_tag = "Cargo pod"; dir = 6; icon_state = "xraycamera"; name = "security camera"; network = list("fsci"); screen_loc = ""},/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_cargopod) "di" = (/obj/structure/cable,/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) "dj" = (/obj/structure/chair/comfy/shuttle{icon_state = "shuttle_chair"; dir = 1},/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) "dk" = (/obj/machinery/door/airlock/grunge{name = "Syndicate Ship Airlock"; req_one_access_txt = "150"},/obj/structure/cable,/turf/open/floor/mineral/plastitanium/red,/area/ruin/space/has_grav/syndicate_forgotten_ship) +"dl" = (/obj/machinery/door/password/voice/sfc,/obj/structure/fans/tiny,/obj/machinery/door/airlock/grunge{armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 90); desc = "Vault airlock preventing air from going out."; name = "Syndicate Vault Airlock"; req_one_access_txt = "150"},/turf/open/floor/pod/dark,/area/ruin/space/has_grav/powered/syndicate_forgotten_vault) +"dm" = (/obj/structure/closet/crate/secure/gear{req_one_access_txt = "150"},/turf/open/floor/pod/dark,/area/ruin/space/has_grav/powered/syndicate_forgotten_vault) "dn" = (/obj/machinery/door/airlock/grunge{name = "Syndicate Ship Airlock"; req_one_access_txt = "150"},/turf/open/floor/plating,/area/ruin/space/has_grav/syndicate_forgotten_ship) "dv" = (/obj/structure/closet/crate/secure/gear{req_one_access_txt = "150"},/turf/open/floor/mineral/plastitanium,/area/ruin/space/has_grav/syndicate_forgotten_ship) (1,1,1) = {" -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaabababababababababababaaaaabababababababababababababababaaaaaa -aaaaabababciadadadadadadadacababababciadadaeadadacababadadadacababaaaa -abababafadadaladadaAcfaycladadadadadadbOaialaicnadadabadaGbradadababaa -abapapapaddvaladawawawawawcoadajakaradbSalalalalahadabadawawawadadabab -abapapapadalaladadadchadadadadawbvbPadadadaUanadadadaqadadcpadadadacab -abasapapadalaladagaoaoaoaBaIadcjbVdiadalalalalalcradaEawawawawawbVauab -abababafadalaladbwaOaoaobncmadawdjdiadalalatatalaladceawawaVcuawbVauab -abababafaddvaladadadbxbxadbgadadaddkadamaxahahalaFadbWawawawawawaWauab -abapapapadalaladavaNaHaScyaDadcvaJczadalaxaMcAahaladawawcBaVaTawbVauab -abapapapadalaldnaRcCcDcxcEcFcGcHcIcWcKcHcNcOcPcQcRcqcScScTcLawawbkauab -abasapapaddvaladazbccUaScVcMadalaCaladaPaxahahahcXadawawawaVcaawbVauab -abababafaddvaladadadbybyadadadadadaQadaKaxahahalaFadbWawawawawawbTauab -abababafadalaladbzbYalalbYahadbGbHbIadaPaPbQaLalaladcgawawaVcbawbVauab -abapapapadalaldnbDbEalalbEbDadbIcdbIadalalaPalalctadceawawawawawbVauab -abapapapadalaladalalalalalaladcZadcZadadadbeanadadadadadadcJadadbZacab -abasapapaddvaladbYalccccalbYaddbaddcadalalaPalalahadabaddfawdgadadabab -abababafadadaladalcYahdacYadadadadadadbJbKaPbKbLadadabaddfbtadadababaa -aaaaabababciadadadadadadadacababababciadadbMadadacababadadadacababaaaa -aaaaaaaaabababababababababababaaaaababababbNababababababababababaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaYaYaYaYaaaaaaaabaaaaaaYaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaYaYaYbqbqbqabaaabbNabbqbqaYaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaYaYaZbqbqbbbXbbbbbRbFckbbbqbqaYaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaYaYaYaYbqbbbbaXdhbfbdbhbibbbbbqaYaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaYaYaYaZbqbbbjbjbjbhbhbhbjcsbbbqaYaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaYaYaYaYbqbbblbjbmbjbjbjbjcwbbbqaYaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaYaYaYaYbqbbbbbobjbpbCbubUbbbbbqaYaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaYaZaYbqbqbbbbbbbbbbbbbbbbbqbqaYaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaYaYaYaYbqbqbqabbsbqbqbqbqbqaYaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaYaYaYaZaYaYaaaYaYaYaYaYaYaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaYaYaYaYaaaaaYaYaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaabababababababababababaaaaabababababababababababababababaaaaaaaa +aaaaaaaaaaaaaaaaaaabababciadadadadadadadacababababciadadaeadadacababadadadacababaaaaaa +aaaaaaaaaaaaaaabababafadadaladadaAcfaycladadadadadadbOaialaicnadadabadaGbradadababaaaa +aaaaaaaaaaaaaaabapapapaddvaladbVawawawawcoadajakaradbSalalalalahadabadawawawadadababaa +aaaaaaaaaaaaaaabapapapadalaladadadchadadadadawbvbPadadadaUanadadadaqadadcpadadadacabaa +aaaaaaaaaaaaaaabasapapadalaladagaoaoaoaBaIadcjbVdiadalalalalalcradaEawawawawawbVauabaa +aaaaaaaaaaaaaaabababafadalaladbwaOaoaobncmadawdjdiadalalatatalaladceawawaVcuawbVauabaa +aaaaaaaaaaaaaaabababafaddvaladadadbxbxadbgadadaddkadamaxahahalaFadbWawawawawawaWauabaa +aaaaaaaaaaaaaaabapapapadalaladavaNaHaScyaDadcvaJczadalaxaMcAahaladawawcBaVaTawbVauabaa +aaaaaaaaaaaaaaabapapapadalaldnaRcCcDcxcEcFcGcHcIcWcKcHcNcOcPcQcRcqcScScTcLawawbkauabaa +aaaaaaaaaaaaaaabasapapaddvaladazbccUaScVcMadalaCaladaPaxahahahcXadawawawaVcaawbVauabaa +aaaaaaaaaaaaaaabababafaddvaladadadbybyadadadadadaQadaKaxahahalaFadbWawawawawawbTauabaa +aaaaaaaaaaaaaaabababafadalaladbzbYalalbYahadbGbHbIadaPaPbQaLalaladcgawawaVcbawbVauabaa +aaaaaaaaaaaaaaabapapapadalaldnbDbEalalbEbDadbIcdbIadalalaPalalctadceawawawawawbVauabaa +aaaaaaaaaaaaaaabapapapadalaladalalalalalaladcZadcZadadadbeanadadadadadadcJadadbZacabaa +aaaaaaaaaaaaaaabasapapaddvaladbYalccccalbYaddbaddcadalalaPalalahadabaddfawdgadadababaa +aaaaaaaaaaaaaaabababafadadaladalcYahdacYadadadadadadbJbKaPbKbLadadabaddfbtadadababaaaa +aaaaaaaaaaaaaaaaaaabababciadadadadadadadacababababciadadbMadadacababadadadacababaaaaaa +aaaaaaaaaaaaaaaaaaaaaaabababababababababababaaaaababababbNababababababababababaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaYaYaaaYaYaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaYaYaYaYaYaYaYaYaaaabaaaaaaYaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqbqbqbqbqbqbqbqbqaYabbNabbqbqaYaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqbqaZaZaZaZaZbbbXbbbbbRbFckbbbqbqaYaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqaZaZbdbBddaZbbaXdhbfbjbhbibbbbbqaYaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaYbqaZbAdedededlbjbjbjbhbhbhbjcsbbbqaYaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaYbqaZbAdededeaZblbjbmbjbjbjbjcwbbbqaYaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaYbqaZaZdmdmdmaZbbbobjbpbCbubUbbbbbqaYaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqbqaZaZaZaZaZbbbbbbbbbbbbbbbbbqbqaYaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabqbqbqbqbqbqbqbqbqbsbqbqbqbqbqaYaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaYaYaYaYaYaaaYaYaYaYaYaYaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaYaYaaaaaYaYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaYaaaaaYaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa "} diff --git a/code/game/area/areas/ruins/space.dm b/code/game/area/areas/ruins/space.dm index a9fe0b018a1..e23afe9312f 100644 --- a/code/game/area/areas/ruins/space.dm +++ b/code/game/area/areas/ruins/space.dm @@ -418,14 +418,4 @@ /area/ruin/space/has_grav/powered/ancient_shuttle name = "Ancient Shuttle" - icon_state = "yellow" - -//SYNDICATE SPACE SHIP - -/area/ruin/space/has_grav/syndicate_forgotten_ship - name = "Syndicate Forgotten Ship" - icon_state = "syndie-ship" - -/area/ruin/space/has_grav/syndicate_forgotten_cargopod - name = "Syndicate Forgotten Cargo pod" - icon_state = "syndie-ship" + icon_state = "yellow" \ No newline at end of file diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index be2bd91065c..f82db24685f 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -652,7 +652,7 @@ gloves = /obj/item/clothing/gloves/combat back = /obj/item/storage/backpack l_pocket = /obj/item/gun/ballistic/automatic/pistol/APS - r_pocket = /obj/item/documents/syndicate/red belt = /obj/item/storage/belt/military/assault id = /obj/item/card/id/syndicate_command/captain_id + backpack_contents = list(/obj/item/documents/syndicate/red, /obj/item/paper/fluff/ruins/forgottenship/password) implants = list(/obj/item/implant/weapons_auth) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index ca9c2e1a720..7ac4a91fe99 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -886,4 +886,4 @@ armor = list("melee" = 80, "bullet" = 80, "laser" = 50, "energy" = 60, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100) strip_delay = 130 max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT - actions_types = list() + actions_types = list() \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm b/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm index 59fdf21c97d..0de33e2b5fc 100644 --- a/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm +++ b/code/modules/mob/living/simple_animal/hostile/nanotrasen.dm @@ -31,6 +31,11 @@ dodging = TRUE footstep_type = FOOTSTEP_MOB_SHOE +/mob/living/simple_animal/hostile/nanotrasen/Aggro() + ..() + summon_backup(15) + say("411 in progress, requesting backup!") + /mob/living/simple_animal/hostile/nanotrasen/ranged icon_state = "nanotrasenranged" @@ -65,6 +70,9 @@ projectilesound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg' loot = list(/obj/effect/mob_spawn/human/corpse/nanotrasenassaultsoldier) +/mob/living/simple_animal/hostile/nanotrasen/Aggro() + ..() + /mob/living/simple_animal/hostile/nanotrasen/elite name = "Nanotrasen Elite Assault Officer" desc = "Pray for your life, syndicate. Run while you can." @@ -104,4 +112,6 @@ status_flags = CANPUSH del_on_death = 1 dodging = TRUE - footstep_type = FOOTSTEP_MOB_SHOE \ No newline at end of file + +/mob/living/simple_animal/hostile/nanotrasen/Aggro() + ..() \ No newline at end of file diff --git a/code/modules/ruins/spaceruin_code/forgottenship.dm b/code/modules/ruins/spaceruin_code/forgottenship.dm new file mode 100644 index 00000000000..4711d0e2718 --- /dev/null +++ b/code/modules/ruins/spaceruin_code/forgottenship.dm @@ -0,0 +1,68 @@ +// forgottenship ruin +GLOBAL_VAR_INIT(fscpassword, generate_password()) + +/proc/generate_password() + return "[pick(GLOB.phonetic_alphabet)] [rand(1,1000)]" + +/////////// forgottenship objects + +/obj/machinery/door/password/voice/sfc + name = "Voice-activated Vault door" + desc = "You'll need special syndicate passcode to open this one." +/obj/machinery/door/password/voice/sfc/Initialize(mapload) + . = ..() + password = "[GLOB.fscpassword]" + +/////////// forgottenship lore + +/obj/item/paper/fluff/ruins/forgottenship/password + name = "Old pamphlet" + +/obj/item/paper/fluff/ruins/forgottenship/password/Initialize(mapload) + . = ..() + info = "Welcome to most advanced cruiser owned by Cyber Sun Industries!
You might notice, that this cruiser is equipped with 12 prototype laser turrets making any hostile boarding attempts futile.
Other facilities built on the ship are: Simple atmospheric system, Camera system with built-in X-ray visors and Safety module, enabling emergency engines in case of... you know, emergency.
Emergency system will bring you to nearest syndicate pod containing everything needed for human life.

In case of emergency, you must remember the pod-door activation code - [GLOB.fscpassword]

Cyber Sun Industries (C) 2484." + icon_state = "paper_words" + item_state = "paper" + +/obj/item/paper/fluff/ruins/forgottenship/powerissues + name = "Power issues" + info = "Welcome to battle cruiser SCSBC-12!
Our most advanced systems allow you to fly in space and never worry about power issues!
However, emergencies occur, and in case of power loss, you must enable emergency generator using uranium as fuel and enable turrets in bridge afterwards.

REMEMBER! CYBERSUN INDUSTRIES ARE NOT RESPONSIBLE FOR YOUR DEATH OR SHIP LOSS WHEN TURRETS ARE DISABLED!

Cyber Sun Industries (C) 2484." + +/////////// forgottenship areas + +/area/ruin/space/has_grav/syndicate_forgotten_ship + name = "Syndicate Forgotten Ship" + icon_state = "syndie-ship" + +/area/ruin/space/has_grav/syndicate_forgotten_cargopod + name = "Syndicate Forgotten Cargo pod" + icon_state = "syndie-ship" + +/area/ruin/space/has_grav/powered/syndicate_forgotten_vault + name = "Syndicate Forgotten Vault" + icon_state = "syndie-ship" + + //Cybersun hardsuit + +/obj/item/clothing/head/helmet/space/hardsuit/cybersun + name = "cybersun hardsuit helmet" + desc = "Prototype hardsuit helmet with experimental armor plates, protecting from laser-based weapons very well, while giving limited protection against anything else." + icon_state = "cybersun" + item_state = "cybersun" + hardsuit_type = "cybersun" + armor = list("melee" = 35, "bullet" = 35, "laser" = 70, "energy" = 50, "bomb" = 15, "bio" = 100, "rad" = 50, "fire" = 95, "acid" = 95) + strip_delay = 600 + actions_types = list() + + +/obj/item/clothing/suit/space/hardsuit/cybersun + icon_state = "cybersun" + item_state = "cybersun" + hardsuit_type = "cybersun" + name = "cybersun hardsuit" + desc = "Prototype hardsuit with experimental armor plates, protecting from laser-based weapons very well, while giving limited protection against anything else. Requires the user to activate the inner mechanism in order to unequip it, making it nearly impossible to take it off from somebody else." + armor = list("melee" = 35, "bullet" = 35, "laser" = 70, "energy" = 50, "bomb" = 15, "bio" = 100, "rad" = 50, "fire" = 95, "acid" = 95) + strip_delay = 600 + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/cybersun + actions_types = list(/datum/action/item_action/toggle_helmet) + jetpack = /obj/item/tank/jetpack/suit \ No newline at end of file diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 9ec4bd9359c..d136267fb54 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 009c8413048..33da91ab696 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 9f03c75982b..dd657296830 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 78d47339cff..34d12591cb7 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 154eb3e2de1..9501aa95cdd 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2769,6 +2769,7 @@ #include "code\modules\ruins\spaceruin_code\crashedship.dm" #include "code\modules\ruins\spaceruin_code\deepstorage.dm" #include "code\modules\ruins\spaceruin_code\DJstation.dm" +#include "code\modules\ruins\spaceruin_code\forgottenship.dm" #include "code\modules\ruins\spaceruin_code\hilbertshotel.dm" #include "code\modules\ruins\spaceruin_code\listeningstation.dm" #include "code\modules\ruins\spaceruin_code\oldstation.dm"