diff --git a/GainStation13/code/game/donator.dm b/GainStation13/code/game/donator.dm index bcad8753c5..0300ac2dcf 100644 --- a/GainStation13/code/game/donator.dm +++ b/GainStation13/code/game/donator.dm @@ -9,7 +9,7 @@ name = "GATO Badge - Correspondent" category = LOADOUT_CATEGORY_DONATOR path = /obj/item/clothing/accessory/medal/gato_badge/middleman - ckeywhitelist = list("johnjimjim", "sonoida", "yeeny", "Not Number") + ckeywhitelist = list("johnjimjim", "sonoida", "yeeny", "Not Number", "Not_Number", "NotNumber",) /datum/gear/halsey_overcoat name = "Halsey's Commander Overcoat" @@ -29,12 +29,6 @@ path = /obj/item/gun/ballistic/automatic/toy/pistol/haydee ckeywhitelist = list("lumu", "sonoida") -//sorry for defining this here, just thought it'd be more convenient -/obj/item/clothing/suit/chloe/halsey //sorry to whoever chloe is, but that coat is far too badass not to be used - name = "Halsey's Commander Overcoat" - desc = "A Ginormous red overcoat that looks fit for a commander. Has a tag on it that reads: 'Property of Halsey Harmonten. Please return if lost!'" - armor = list("melee" = 20, "bullet" = 20, "laser" = 0,"energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 0) //worn by a captain player, might as well recompensate not wearing the carapace - /datum/gear/rose_plush name = "Dezir Rose Plush" category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS @@ -53,10 +47,6 @@ path = /obj/item/clothing/suit/storage/blueshield/grimmy ckeywhitelist = list("bbgrimmy") -/obj/item/clothing/suit/storage/blueshield/grimmy - name = "Overcoat of the Destitute" - desc = "Welcome all to the everlasting all-time low. Please put your hands together for the ever-failing one man show: Domino!" - /datum/gear/tarek_gps name = "Tarek's GPS" category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS @@ -69,10 +59,6 @@ path = /obj/item/crowbar/bronze/glaug ckeywhitelist = list("happytpr") -/obj/item/crowbar/bronze/glaug - name = "Milwaukee Pocket Crowbar" - desc = "Much more expensive. Still serves the same function." - /datum/gear/fatfang name = "Fattening Fangs Injector" category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS @@ -85,15 +71,6 @@ path = /obj/item/storage/belt/utility ckeywhitelist = list("killmewitha22", "Killmewitha22", "KILLMEWITHA22", "sonoida") -/obj/item/toy/sword/chloesabre/halsey - name = "Halsey's Sabre" - desc = "An elegant weapon, similar in design to the Captain's Sabre, but with a platinum hilt and an adamantine blade. the hilt has an engraved hyena on it." - force = 16 - -/obj/item/gun/ballistic/revolver/mateba/moka - name = "\improper Custom Unica 6 revolver" - desc = "An elegant and ornate revolver belonging to a certain hellcat commander. There are some words carved on its side: 'Dura Lex, Sed Lex'" - //metha rossi you fat hog /datum/gear/wgspell_add @@ -114,18 +91,44 @@ path = /obj/item/book/granter/spell/fattening/steal ckeywhitelist = list("sonoida", "themrsky", "Not Number") - /datum/gear/white_eyepatch_cabal name = "Cabal's Eyepatch" category = LOADOUT_CATEGORY_GLASSES path = /obj/item/clothing/glasses/eyepatch/cabal ckeywhitelist = list("spess_lizurd", "SPESS LIZURD", "spess lizurd", "SPESS_LIZURD", "spesslizurd", "sonoida") -/datum/gear/white_eyepatch +/datum/gear/white_eyepatch //accessible to anyone, at donator's request name = "White Eyepatch" category = LOADOUT_CATEGORY_GLASSES path = /obj/item/clothing/glasses/eyepatch/white +/datum/gear/metis_plush + name = "Metis Plush" + category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + path = /obj/item/toy/plush/gs13/metis + ckeywhitelist = list("paraillegal", "Paraillegal") + +/datum/gear/wheelys + name = "Wheely-Heels" + category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + path = /obj/item/clothing/shoes/wheelys + ckeywhitelist = list("colorlessspy", "Colorlessspy") + +/datum/gear/crowbars_plush + name = "Crowbars Plush" + category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + path = /obj/item/toy/plush/gs13/crowbars + ckeywhitelist = list("M16nPregnant", "m16npregnant" ) + +/datum/gear/sams_welder + name = "Sam's Unlucky Welder" + category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS + path = /obj/item/weldingtool/bronze + ckeywhitelist = list("almaniak", "Almaniak", "AlManiak") + +// +//item presets for donator items +// /obj/item/clothing/glasses/eyepatch/white name = "White eyepatch" desc = "Smells faintly of medicine and headaches." @@ -138,26 +141,24 @@ icon_state = "eyepatch_white" item_state = "eyepatch_white" -/datum/gear/metis_plush - name = "Metis Plush" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS - path = /obj/item/toy/plush/gs13/metis - ckeywhitelist = list("paraillegal") +/obj/item/toy/sword/chloesabre/halsey + name = "Halsey's Sabre" + desc = "An elegant weapon, similar in design to the Captain's Sabre, but with a platinum hilt and an adamantine blade. the hilt has an engraved hyena on it." + force = 16 -/datum/gear/wheelys - name = "Wheely-Heels" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS - path = /obj/item/clothing/shoes/wheelys - ckeywhitelist = list("colorlessspy") +/obj/item/gun/ballistic/revolver/mateba/moka + name = "\improper Custom Unica 6 revolver" + desc = "An elegant and ornate revolver belonging to a certain hellcat commander. There are some words carved on its side: 'Dura Lex, Sed Lex'" -/datum/gear/crowbars_plush - name = "Crowbars Plush" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS - path = /obj/item/toy/plush/gs13/crowbars - ckeywhitelist = list("M16nPregnant") +/obj/item/clothing/suit/chloe/halsey //sorry to whoever chloe is, but that coat is far too badass not to be used + name = "Halsey's Commander Overcoat" + desc = "A Ginormous red overcoat that looks fit for a commander. Has a tag on it that reads: 'Property of Halsey Harmonten. Please return if lost!'" + armor = list("melee" = 20, "bullet" = 20, "laser" = 0,"energy" = 20, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 0) //worn by a captain player, might as well recompensate not wearing the carapace -/datum/gear/sams_welder - name = "Sam's Unlucky Welder" - category = LOADOUT_SUBCATEGORY_BACKPACK_TOYS - path = /obj/item/weldingtool/bronze - ckeywhitelist = list("almaniak") +/obj/item/clothing/suit/storage/blueshield/grimmy + name = "Overcoat of the Destitute" + desc = "Welcome all to the everlasting all-time low. Please put your hands together for the ever-failing one man show: Domino!" + +/obj/item/crowbar/bronze/glaug + name = "Milwaukee Pocket Crowbar" + desc = "Much more expensive. Still serves the same function." diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm index f0575e50f0..29ffcf5391 100644 --- a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm @@ -1 +1,11 @@ //GS13 - markings, ported or our own (preferably mark where you took them from) + +/datum/sprite_accessory/hair/elize + name = "Elize" + icon = 'GainStation13/icons/mob/human_face.dmi' + icon_state = "hair_elize" + +/datum/sprite_accessory/hair/lem + name = "Lem" + icon = 'GainStation13/icons/mob/human_face.dmi' + icon_state = "hair_lem" diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm index e2ab27aad4..32d38c386a 100644 --- a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm @@ -7,6 +7,7 @@ icon_state = "gator" color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN + hide_legs = FALSE /datum/sprite_accessory/taur/fatdrake //ported from Vorestation name = "Fat Drake" @@ -46,3 +47,17 @@ icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' icon_state = "bigleggy" color_src = MUTCOLORS + +/datum/sprite_accessory/taur/fatnaga //ported from Vorestation + name = "Fat Naga" + icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' + icon_state = "fatnaga" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/taur/altnaga //ported from Vorestation + name = "Alt Naga" + icon = 'GainStation13/icons/mob/markings/mam_taur.dmi' + icon_state = "altnaga" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm index 40fb7df37f..96786439c4 100644 --- a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/snouts.dm @@ -6,3 +6,50 @@ icon_state = "hjackal" color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/snouts/mam_snouts/synthlizproto1 + name = "Synthetic Lizard - Prototype Visor 1" + icon = 'GainStation13/icons/mob/markings/mam_snouts.dmi' + icon_state = "synthlizproto1" + color_src = MATRIXED + +/datum/sprite_accessory/snouts/mam_snouts/synthlizproto2 + name = "Synthetic Lizard - Prototype Visor 2" + icon = 'GainStation13/icons/mob/markings/mam_snouts.dmi' + icon_state = "synthlizproto2" + color_src = MATRIXED + +/datum/sprite_accessory/snouts/mam_snouts/gator + name = "Gator" + icon = 'GainStation13/icons/mob/markings/mam_snouts.dmi' + icon_state = "gator" + color_src = MATRIXED + +//eastern dragon +/datum/sprite_accessory/snouts/mam_snouts/easterndragon + name = "Eastern Dragon" + icon = 'GainStation13/icons/mob/markings/char_snouts.dmi' + icon_state = "easterndw" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/snouts/mam_snouts/easterndragon/no_whiskers + name = "Eastern Dragon - No Whiskers" + icon = 'GainStation13/icons/mob/markings/char_snouts.dmi' + icon_state = "easterndnw" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/snouts/mam_snouts/feasterndragon + name = "Eastern Dragon (Top)" + icon = 'GainStation13/icons/mob/markings/char_snouts.dmi' + icon_state = "feasterndw" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/snouts/mam_snouts/feasterndragon/no_whiskers + name = "Eastern Dragon - No Whiskers (Top)" + icon = 'GainStation13/icons/mob/markings/char_snouts.dmi' + icon_state = "feasterndnw" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN diff --git a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/tails.dm b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/tails.dm index f0575e50f0..50c743abf6 100644 --- a/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/tails.dm +++ b/GainStation13/code/modules/mob/dead/new_player/sprite_accessories/tails.dm @@ -1 +1,92 @@ //GS13 - markings, ported or our own (preferably mark where you took them from) + +//snaketail +/datum/sprite_accessory/tails/lizard/snaketail //GS13 - ...6 seperate paths for one tail. Wew. + name = "Snaketail" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "snaketail" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails_animated/lizard/snaketail + name = "Snaketail" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "snaketail" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails/human/snaketail + name = "Snaketail" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "snaketail" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails_animated/human/snaketail + name = "Snaketail" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "snaketail" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails/mam_tails/snaketail + name = "Snaketail" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "snaketail" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/tails_animated/mam_tails_animated/snaketail + name = "Snaketail" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "snaketail" + color_src = MATRIXED + matrixed_sections = MATRIX_RED_GREEN + +//spaded tail +/datum/sprite_accessory/tails/mam_tails/spade + name = "Demon Spade" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "spade" + +/datum/sprite_accessory/tails_animated/mam_tails_animated/spade + name = "Demon Spade" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "spade" + +/datum/sprite_accessory/tails/human/spade + name = "Demon Spade" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "spade" + +/datum/sprite_accessory/tails_animated/human/spade + name = "Demon Spade" + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + icon_state = "spade" + +//deer tail + + +/datum/sprite_accessory/tails/human/deer + name = "Deer" + icon_state = "deer" + color_src = MATRIXED + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + +/datum/sprite_accessory/tails_animated/human/deer + name = "Deer" + icon_state = "deer" + color_src = MATRIXED + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + +/datum/sprite_accessory/tails/mam_tails/deer + name = "Deer" + icon_state = "deer" + color_src = MATRIXED + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' + +/datum/sprite_accessory/tails_animated/mam_tails_animated/deer + name = "Deer" + icon_state = "deer" + color_src = MATRIXED + icon = 'GainStation13/icons/mob/markings/mam_tails.dmi' diff --git a/GainStation13/icons/mob/bees.dmi b/GainStation13/icons/mob/bees.dmi new file mode 100644 index 0000000000..5d9bfea48b Binary files /dev/null and b/GainStation13/icons/mob/bees.dmi differ diff --git a/GainStation13/icons/mob/human_face.dmi b/GainStation13/icons/mob/human_face.dmi new file mode 100644 index 0000000000..3e73aaca82 Binary files /dev/null and b/GainStation13/icons/mob/human_face.dmi differ diff --git a/GainStation13/icons/mob/markings/char_snouts.dmi b/GainStation13/icons/mob/markings/char_snouts.dmi new file mode 100644 index 0000000000..92b3163d84 Binary files /dev/null and b/GainStation13/icons/mob/markings/char_snouts.dmi differ diff --git a/GainStation13/icons/mob/markings/mam_taur.dmi b/GainStation13/icons/mob/markings/mam_taur.dmi index 3b6ed4bcfa..736e047fb8 100644 Binary files a/GainStation13/icons/mob/markings/mam_taur.dmi and b/GainStation13/icons/mob/markings/mam_taur.dmi differ diff --git a/GainStation13/icons/mob/radial.dmi b/GainStation13/icons/mob/radial.dmi new file mode 100644 index 0000000000..3dfdd2fd5a Binary files /dev/null and b/GainStation13/icons/mob/radial.dmi differ diff --git a/GainStation13/icons/mob/suits.dmi b/GainStation13/icons/mob/suits.dmi index abcdd082bc..aae27c3fc2 100644 Binary files a/GainStation13/icons/mob/suits.dmi and b/GainStation13/icons/mob/suits.dmi differ diff --git a/GainStation13/icons/obj/device.dmi b/GainStation13/icons/obj/device.dmi new file mode 100644 index 0000000000..b4a7291677 Binary files /dev/null and b/GainStation13/icons/obj/device.dmi differ diff --git a/GainStation13/icons/obj/lighting.dmi b/GainStation13/icons/obj/lighting.dmi new file mode 100644 index 0000000000..15b4d5adcf Binary files /dev/null and b/GainStation13/icons/obj/lighting.dmi differ diff --git a/_maps/RandomRuins/SpaceRuins/whiteship_CFC01.dmm b/_maps/RandomRuins/SpaceRuins/whiteship_CFC01.dmm index 29e466e5bc..e07e3596da 100644 --- a/_maps/RandomRuins/SpaceRuins/whiteship_CFC01.dmm +++ b/_maps/RandomRuins/SpaceRuins/whiteship_CFC01.dmm @@ -95,18 +95,7 @@ /obj/structure/fans/tiny, /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/docking_port/mobile{ - callTime = 250; - can_move_docking_ports = 1; - dheight = 0; - dir = 2; - dwidth = 11; - height = 17; - launch_status = 0; - movement_force = list("KNOCKDOWN"=0,"THROW"=0); - name = "Salvage Ship"; - port_direction = 8; - preferred_direction = 4; - width = 33 + dir = 2 }, /turf/open/floor/mineral/basaltstone_floor, /area/shuttle/abandoned/crew{ @@ -136,14 +125,10 @@ ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) "ak" = ( -/obj/structure/sign/poster/contraband/communist_state{ - pixel_y = -32 - }, /obj/effect/turf_decal/tile/bar, /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/item/kirbyplants/random, /obj/effect/turf_decal/stripes/corner, /obj/machinery/power/apc{ name = "Food Hall APC"; @@ -195,20 +180,14 @@ ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) "aq" = ( -/obj/effect/decal/cleanable/dirt{ - desc = "A thin layer of dust coating the floor."; - name = "dust" +/obj/structure/sign/barsign{ + req_access = null; + req_access_txt = "0"; + name = "Restaurant Sign" }, -/obj/effect/turf_decal/bot_white, -/obj/machinery/door/poddoor{ - id = "whiteship_starboard" - }, -/obj/structure/fans/tiny, -/obj/structure/fans/tiny, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plating, -/area/shuttle/abandoned/bar{ - name = "Kitchen"; +/turf/closed/wall/mineral/titanium, +/area/shuttle/abandoned/cargo{ + name = "Food Hall"; ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) "ar" = ( @@ -348,6 +327,7 @@ /obj/machinery/light{ dir = 8 }, +/obj/machinery/computer/arcade/orion_trail, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned/cargo{ name = "Food Hall"; @@ -505,9 +485,6 @@ }) "aO" = ( /obj/effect/turf_decal/bot, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/reagent_dispensers/fueltank, /obj/item/clothing/head/welding{ pixel_x = -2; @@ -742,10 +719,7 @@ ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) "bc" = ( -/obj/item/kirbyplants/random{ - pixel_y = 12 - }, -/turf/open/floor/mineral/basaltstone_floor, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/abandoned/crew{ name = "Arrival Hallway"; ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') @@ -792,7 +766,10 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/vending/coffee, +/obj/machinery/vending/snack/random{ + extended_inventory = 1; + free = 1 + }, /turf/open/floor/plasteel, /area/shuttle/abandoned/cargo{ name = "Food Hall"; @@ -808,10 +785,7 @@ name = "Window Blast Door Control"; pixel_y = -24 }, -/obj/machinery/vending/snack/random{ - extended_inventory = 1; - free = 1 - }, +/obj/machinery/vending/mealdor, /turf/open/floor/plasteel, /area/shuttle/abandoned/cargo{ name = "Food Hall"; @@ -875,6 +849,9 @@ /obj/structure/window/reinforced/tinted{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/plasteel/freezer, /area/shuttle/abandoned/bar{ name = "Kitchen"; @@ -1008,7 +985,6 @@ /obj/effect/turf_decal/tile/bar{ dir = 1 }, -/obj/item/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1, /turf/open/floor/plasteel, /area/shuttle/abandoned/cargo{ @@ -1043,12 +1019,12 @@ dir = 4 }, /obj/vehicle/ridden/grocery_cart, -/obj/machinery/light/small{ - pixel_x = 16 - }, /obj/structure/sign/poster/contraband/shamblers_juice{ pixel_y = -32 }, +/obj/machinery/light/small{ + pixel_x = 16 + }, /turf/open/floor/plasteel/checker, /area/shuttle/abandoned/crew{ name = "Arrival Hallway"; @@ -1163,7 +1139,7 @@ }) "bQ" = ( /obj/structure/sign/poster/contraband/chefpropaganda, -/turf/closed/wall/mineral/titanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/abandoned/bar{ name = "Kitchen"; ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') @@ -1248,7 +1224,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{ dir = 5 }, -/obj/structure/scale, +/obj/structure/scale{ + name = "discount counter" + }, /turf/open/floor/plasteel, /area/shuttle/abandoned/cargo{ name = "Food Hall"; @@ -1258,7 +1236,7 @@ /obj/structure/sign/warning/docking{ name = "\improper KEEP CLEAR: BLAST DOORS" }, -/turf/closed/wall/mineral/titanium, +/turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/abandoned/bar{ name = "Kitchen"; ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') @@ -1418,10 +1396,6 @@ /obj/effect/turf_decal/tile/blue{ dir = 8 }, -/obj/structure/table/reinforced, -/obj/machinery/recharger{ - pixel_x = -14 - }, /obj/machinery/airalarm/all_access{ pixel_y = 24 }, @@ -1438,17 +1412,14 @@ pixel_y = -5; pixel_x = 5 }, -/obj/item/paper{ - pixel_x = -7; - pixel_y = 3; - name = "Radio Network Manual"; - info = "RADIO NETWORK MANUAL


Every order intercom is set on 145.3 frequency by default. There are 6 of them, 0-5. It is recommended that you familiarize yourself with the layout of these tables for more efficient ship operation.

The general radio broadcast channel is for communicating with nearby crafts and stations. May be used for advertising purposes. It is recommended to temporary mute the order receiver intercom when preparing for general broadcast, as orders may interrupt your transmission." - }, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/stripes{ icon_state = "trim"; dir = 5 }, +/obj/machinery/computer/shuttle/white_ship{ + dir = 8 + }, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned/bridge{ name = "Bridge"; @@ -1495,10 +1466,6 @@ }, /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/stock_parts/cell/high{ - pixel_y = 9; - pixel_x = 4 - }, /obj/structure/cable, /obj/item/circuitboard/machine/chem_dispenser{ pixel_x = -7; @@ -1510,9 +1477,6 @@ pixel_x = 24 }, /obj/effect/turf_decal/delivery, -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/cell_charger, /obj/item/stock_parts/cell/high/plus, /obj/item/radio/off{ @@ -1520,6 +1484,9 @@ pixel_y = 0; name = "radio" }, +/obj/machinery/light/small{ + dir = 4 + }, /turf/open/floor/plating, /area/shuttle/abandoned/engine{ name = "Engineering"; @@ -1617,9 +1584,10 @@ name = "drain"; dir = 1 }, -/obj/machinery/door/window/westleft{ +/obj/machinery/door/window/westright{ dir = 2; - name = "Drinks Access" + name = "Drinks Access"; + icon_state = "left" }, /turf/open/floor/plasteel, /area/shuttle/abandoned/bar{ @@ -1632,7 +1600,8 @@ dir = 4 }, /obj/machinery/door/window/westright{ - dir = 2 + dir = 2; + name = "Drinks Access" }, /obj/machinery/chem_dispenser/drinks/fullupgrade{ dir = 8 @@ -1807,10 +1776,12 @@ name = "paper - printed note"; info = "Hello lucky soul!

I'm Cynthia! More precisely, one of the Autonomous Spacefearring Nutrision Distribution Centers (A.S.N.D.)! One of the Cynthia Fitness Corporation most advanced public assets! I don't have much time, so I'll make it quick! I got hit by a solar flare, lost contact with CFC, and soon being offline from hivemind will trigger my termination protocols as I no longer be the Cynthia!

I'm asking for one thing! Please, continue my mission! Bring 'healthy' yummies to whoever wants (or needs, by your judgment)! CFC will be grateful for your service! Make me proud of you, random explorer!



((PS. Remember my company policy! Clients with BMI equal or higher than 35 gets at least triple servings!))" }, -/obj/machinery/computer/shuttle/white_ship{ +/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship{ + designate_time = 100; dir = 8; - name = "A.S.N.D. Console"; - desc = "Used to control the A.S.N.D. Ship." + view_range = 14; + x_offset = -4; + y_offset = -8 }, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned/bridge{ @@ -2151,11 +2122,8 @@ /obj/machinery/light{ light_color = "#cee5d2" }, -/obj/machinery/chem_master/condimaster{ - name = "CondiMaster Neo"; - pixel_x = -4 - }, /obj/effect/turf_decal/bot_white, +/obj/machinery/chem_master/condimaster, /turf/open/floor/plasteel/cafeteria, /area/shuttle/abandoned/bar{ name = "Kitchen"; @@ -2271,11 +2239,6 @@ ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) "cY" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - external_pressure_bound = 140; - name = "server vent"; - pressure_checks = 0 - }, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -2283,6 +2246,7 @@ icon_state = "manifold-1"; dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plating, /area/shuttle/abandoned/engine{ name = "Engineering"; @@ -2421,6 +2385,7 @@ /obj/structure/window/reinforced, /obj/machinery/deepfryer, /obj/machinery/door/firedoor/border_only, +/obj/structure/window/reinforced/tinted, /turf/open/floor/plasteel/cafeteria, /area/shuttle/abandoned/bar{ name = "Kitchen"; @@ -2469,6 +2434,7 @@ /obj/item/reagent_containers/food/condiment/milk, /obj/item/reagent_containers/food/condiment/milk, /obj/structure/closet/secure_closet/freezer/fridge, +/obj/structure/window/reinforced/tinted, /turf/open/floor/plasteel/cafeteria, /area/shuttle/abandoned/bar{ name = "Kitchen"; @@ -2550,7 +2516,7 @@ dir = 4; pixel_x = -24 }, -/obj/machinery/light{ +/obj/machinery/light/small{ dir = 8 }, /turf/open/floor/plating, @@ -2941,9 +2907,6 @@ "dN" = ( /obj/effect/turf_decal/bot_white, /obj/structure/window/reinforced, -/obj/machinery/door/window/brigdoor/westleft{ - name = "Pete Containment Unit" - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -2953,6 +2916,12 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/structure/window/reinforced/tinted{ + dir = 1 + }, +/obj/machinery/door/window/brigdoor/westleft{ + name = "Pete Containment Unit" + }, /turf/open/floor/plasteel/freezer, /area/shuttle/abandoned/bar{ name = "Kitchen"; @@ -3038,6 +3007,7 @@ /obj/structure/table/reinforced, /obj/structure/window/reinforced, /obj/item/reagent_containers/glass/beaker/large, +/obj/structure/window/reinforced/tinted, /turf/open/floor/plasteel/cafeteria, /area/shuttle/abandoned/bar{ name = "Kitchen"; @@ -3255,7 +3225,6 @@ id = "whiteship_starboard" }, /obj/structure/fans/tiny, -/obj/structure/fans/tiny, /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/shuttle/abandoned/bar{ @@ -3410,38 +3379,9 @@ name = "Kitchen"; ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) -"mR" = ( -/obj/structure/window/reinforced, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/effect/turf_decal/tile/bar, -/obj/machinery/door/firedoor/border_only, -/obj/machinery/vending/cola/blue, -/turf/open/floor/plasteel, -/area/shuttle/abandoned/cargo{ - name = "Food Hall"; - ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') - }) "nM" = ( /obj/structure/sign/poster/contraband/space_up, /turf/closed/wall/mineral/titanium, -/area/shuttle/abandoned/cargo{ - name = "Food Hall"; - ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') - }) -"nT" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/structure/sign/barsign{ - pixel_y = 32; - req_access = null; - req_access_txt = "0"; - name = "Restaurant Sign" - }, -/turf/open/floor/plasteel, /area/shuttle/abandoned/cargo{ name = "Food Hall"; ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') @@ -3529,20 +3469,15 @@ ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) "qY" = ( -/obj/effect/turf_decal/tile/bar, -/obj/effect/turf_decal/tile/bar{ - dir = 1 - }, -/obj/machinery/vending/mealdor, /obj/structure/sign/poster/contraband/eat{ pixel_x = 32 }, /obj/machinery/airalarm/all_access{ pixel_y = 24 }, -/turf/open/floor/plasteel, -/area/shuttle/abandoned/cargo{ - name = "Food Hall"; +/turf/closed/wall/mineral/titanium, +/area/shuttle/abandoned/crew{ + name = "Arrival Hallway"; ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) "rT" = ( @@ -3732,9 +3667,6 @@ }) "zn" = ( /obj/effect/turf_decal/bot, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/effect/spawner/lootdrop/keg, /turf/open/floor/plating, /area/shuttle/abandoned/engine{ @@ -3826,6 +3758,12 @@ name = "Kitchen"; ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') }) +"Cv" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/shuttle/abandoned/cargo{ + name = "Food Hall"; + ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') + }) "DK" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/tile/green{ @@ -3923,6 +3861,7 @@ pixel_y = -28; listening = 0 }, +/obj/structure/table/wood, /turf/open/floor/plasteel/dark, /area/shuttle/abandoned/cargo{ name = "Food Hall"; @@ -4078,6 +4017,12 @@ dir = 8 }, /turf/open/floor/plating, +/area/shuttle/abandoned/engine{ + name = "Engineering"; + ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') + }) +"Sc" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/abandoned/engine{ name = "Engineering"; ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') @@ -4096,6 +4041,12 @@ }, /obj/item/storage/bag/tray, /turf/open/floor/plasteel, +/area/shuttle/abandoned/bar{ + name = "Kitchen"; + ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') + }) +"Ts" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, /area/shuttle/abandoned/bar{ name = "Kitchen"; ambientsounds = list('sound/ambience/ambinice.ogg','sound/ambience/ambigen1.ogg','sound/ambience/ambigen3.ogg','sound/ambience/ambigen4.ogg','sound/ambience/ambigen5.ogg','sound/ambience/ambigen6.ogg','sound/ambience/ambigen7.ogg','sound/ambience/ambigen8.ogg','sound/ambience/ambigen9.ogg','sound/ambience/ambigen10.ogg','sound/ambience/ambigen11.ogg','sound/ambience/ambigen12.ogg','sound/ambience/ambigen14.ogg','sound/ambience/ambigen15.ogg') @@ -4249,6 +4200,9 @@ /obj/structure/window/reinforced/tinted{ dir = 8 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/open/floor/plasteel/freezer, /area/shuttle/abandoned/bar{ name = "Kitchen"; @@ -4334,7 +4288,7 @@ aG aG aG aG -dW +Sc kr kr kr @@ -4410,13 +4364,13 @@ hK aC aP bj -aG +Cv aG aG an an an -dW +Sc xu ds dK @@ -4454,8 +4408,8 @@ bT tC cz Hb -dW -dW +Sc +Sc RP Yw bq @@ -4516,7 +4470,7 @@ an dv AV dZ -aq +ei "} (12,1,1) = {" ae @@ -4554,7 +4508,7 @@ an BE dM ea -an +Ts "} (14,1,1) = {" af @@ -4581,8 +4535,8 @@ cU bn aV aK -aG -nT +aq +bP bZ cn cz @@ -4600,7 +4554,7 @@ aj aj aj aj -aG +Cv fs pG co @@ -4628,9 +4582,9 @@ aX cT dh dy +Ts an -an -an +Ts "} (18,1,1) = {" ah @@ -4654,10 +4608,10 @@ ej (19,1,1) = {" He aj -aj +bc aZ bw -aj +bc qY df cr @@ -4668,7 +4622,7 @@ dS dA an an -an +Ts "} (20,1,1) = {" aj @@ -4678,7 +4632,7 @@ ao de da aj -mR +Cv cs LP DU @@ -4711,8 +4665,8 @@ tS (22,1,1) = {" aj aj -aj bc +ao de ai aj diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index a97c862adc..07b743b9e8 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -297,7 +297,7 @@ #define OFFSET_MUTPARTS "mutantparts" // MINOR TWEAKS/MISC -#define AGE_MIN 18 // youngest a character can be // CITADEL EDIT - 17 --> 18 +#define AGE_MIN 21 // youngest a character can be // CITADEL EDIT - 17 --> 18 //GS13 EDIT - 18 --> 21 #define AGE_MAX 85 // oldest a character can be randomly generated #define AGE_MAX_INPUT 85 // oldest a character's age can be manually set #define WIZARD_AGE_MIN 30 // youngest a wizard can be diff --git a/code/datums/station_traits/negative_traits.dm b/code/datums/station_traits/negative_traits.dm index 09be52d700..c89f41b16b 100644 --- a/code/datums/station_traits/negative_traits.dm +++ b/code/datums/station_traits/negative_traits.dm @@ -284,4 +284,4 @@ weight = 2 event_control_path = /datum/round_event_control/radiation_storm weight_multiplier = 1.5 - max_occurrences_modifier = 2 + max_occurrences_modifier = 0 //GS13 - radstorm bad diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 868adf97f2..129e1cb8be 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -38,6 +38,7 @@ RLD var/ammo_sections = 10 //amount of divisions in the ammo indicator overlay/number of ammo indicator states var/custom_range = 7 var/upgrade = FALSE + var/airlock_dir = 1 //GS13 - airlock direction function /obj/item/construction/Initialize(mapload) . = ..() @@ -283,6 +284,23 @@ RLD //Not scaling these down to button size because they look horrible then, instead just bumping up radius. return MA + +/obj/item/construction/rcd/proc/change_airlock_direction(mob/user) //GS13 - change airlock direction + if(!user) + return + var/list/airlock_dirs = list( + "North/South" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlocknorthsouth"), + "East/West" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlockeastwest") + ) + var/airlockdirs = show_radial_menu(user, src, airlock_dirs, custom_check = CALLBACK(src,PROC_REF(check_menu), user), require_near = TRUE, tooltips = TRUE) + if(!check_menu(user)) + return + switch(airlockdirs) + if("North/South") + airlock_dir = 1 + if("East/West") + airlock_dir = 4 + /obj/item/construction/rcd/proc/change_computer_dir(mob/user) if(!user) return @@ -488,6 +506,7 @@ RLD if(mode == RCD_AIRLOCK) choices += list( "Change Access" = image(icon = 'icons/mob/radial.dmi', icon_state = "access"), + "Change Direction" = image(icon = 'GainStation13/icons/mob/radial.dmi', icon_state = "airlockrotation"), //GS13 - adding airlock rotation "Change Airlock Type" = image(icon = 'icons/mob/radial.dmi', icon_state = "airlocktype") ) else if(mode == RCD_WINDOWGRILLE) @@ -515,6 +534,9 @@ RLD if("Change Access") change_airlock_access(user) return + if("Change Direction") //GS13 - adding airlock direction in RCD + change_airlock_direction(user) + return if("Change Airlock Type") change_airlock_setting(user) return diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index bd97c822e4..291b9e21d4 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -73,7 +73,7 @@ GENETICS SCANNER /obj/item/healthanalyzer name = "health analyzer" - icon = 'icons/obj/device.dmi' + icon = 'GainStation13/icons/obj/device.dmi' //GS13 - better sprite icon_state = "health" item_state = "healthanalyzer" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' @@ -545,6 +545,7 @@ GENETICS SCANNER /obj/item/healthanalyzer/advanced name = "advanced health analyzer" + icon = 'GainStation13/icons/obj/device.dmi' //GS13 - better sprite icon_state = "health_adv" desc = "A hand-held body scanner able to distinguish vital signs of the subject with high accuracy." advanced = TRUE diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index e080310b68..f6d72fc857 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -388,7 +388,7 @@ name = "bluespace tray" icon_state = "bluespace_tray" desc = "A tray created using bluespace technology to fit more food on it." - max_items = 30 // far more items + max_items = 100 //GS13 - we loooove our mountains of food here custom_materials = list(/datum/material/iron = 2000, /datum/material/bluespace = 500) /* diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index e8d8e927c9..1fee950cf3 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -660,6 +660,53 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) wave_explosion_block = EXPLOSION_BLOCK_EXTREME wave_explosion_multiply = EXPLOSION_BLOCK_EXTREME glass_type = /obj/item/stack/sheet/plasmarglass + canSmoothWith = list( + /turf/closed/wall, + /turf/closed/wall/r_wall, + /obj/structure/falsewall, + /obj/structure/falsewall/brass, + /obj/structure/falsewall/reinforced, + /turf/closed/wall/rust, + /turf/closed/wall/r_wall/rust, + /turf/closed/wall/clockwork, + /turf/closed/indestructible/riveted/, + /turf/closed/indestructible/riveted/uranium, + /obj/structure/window/fulltile, + /obj/structure/window/reinforced/fulltile, + /obj/structure/window/reinforced/tinted/fulltile, + /obj/machinery/door, + /obj/machinery/door/airlock/, + /obj/machinery/door/airlock/mining, + /obj/machinery/door/airlock/mining/glass, + /obj/machinery/door/airlock/medical, + /obj/machinery/door/airlock/medical/glass, + /obj/machinery/door/airlock/public, + /obj/machinery/door/airlock/public/glass, + /obj/machinery/door/airlock/research, + /obj/machinery/door/airlock/research/glass, + /obj/machinery/door/airlock/maintenance, + /obj/machinery/door/airlock/maintenance/glass, + /obj/machinery/door/airlock/command/, + /obj/machinery/door/airlock/command/glass, + /obj/machinery/door/airlock/engineering, + /obj/machinery/door/airlock/engineering/glass, + /obj/machinery/door/airlock/engineering/abandoned, + /obj/machinery/door/airlock/security, + /obj/machinery/door/airlock/security/glass, + /obj/machinery/door/airlock/maintenance/abandoned, + /obj/machinery/door/poddoor/shutters/preopen, + /obj/machinery/door/poddoor/shutters, + /obj/machinery/door/window/eastright, + /obj/machinery/door/window/eastleft, + /obj/machinery/door/window/northleft, + /obj/machinery/door/window/northright, + /obj/machinery/door/airlock/external, + /obj/machinery/door/airlock, + /obj/machinery/door/airlock/hatch, + /obj/machinery/door/airlock/engineering/glass/critical, + /obj/machinery/door/airlock/atmos, + /obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks + /obj/structure/window/plasma/reinforced/spawner/east dir = EAST @@ -740,7 +787,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) /obj/machinery/door/airlock/hatch, /obj/machinery/door/airlock/engineering/glass/critical, /obj/machinery/door/airlock/atmos, - /obj/machinery/door/airlock/highsecurity,) + /obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks glass_amount = 2 @@ -801,7 +848,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) /obj/machinery/door/airlock/hatch, /obj/machinery/door/airlock/engineering/glass/critical, /obj/machinery/door/airlock/atmos, - /obj/machinery/door/airlock/highsecurity,) + /obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks glass_amount = 2 @@ -817,6 +864,53 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) flags_1 = PREVENT_CLICK_UNDER_1 smooth = SMOOTH_TRUE glass_amount = 2 + canSmoothWith = list( + /turf/closed/wall, + /turf/closed/wall/r_wall, + /obj/structure/falsewall, + /obj/structure/falsewall/brass, + /obj/structure/falsewall/reinforced, + /turf/closed/wall/rust, + /turf/closed/wall/r_wall/rust, + /turf/closed/wall/clockwork, + /turf/closed/indestructible/riveted/, + /turf/closed/indestructible/riveted/uranium, + /obj/structure/window/fulltile, + /obj/structure/window/reinforced/fulltile, + /obj/structure/window/reinforced/tinted/fulltile, + /obj/machinery/door, + /obj/machinery/door/airlock/, + /obj/machinery/door/airlock/mining, + /obj/machinery/door/airlock/mining/glass, + /obj/machinery/door/airlock/medical, + /obj/machinery/door/airlock/medical/glass, + /obj/machinery/door/airlock/public, + /obj/machinery/door/airlock/public/glass, + /obj/machinery/door/airlock/research, + /obj/machinery/door/airlock/research/glass, + /obj/machinery/door/airlock/maintenance, + /obj/machinery/door/airlock/maintenance/glass, + /obj/machinery/door/airlock/command/, + /obj/machinery/door/airlock/command/glass, + /obj/machinery/door/airlock/engineering, + /obj/machinery/door/airlock/engineering/glass, + /obj/machinery/door/airlock/engineering/abandoned, + /obj/machinery/door/airlock/security, + /obj/machinery/door/airlock/security/glass, + /obj/machinery/door/airlock/maintenance/abandoned, + /obj/machinery/door/poddoor/shutters/preopen, + /obj/machinery/door/poddoor/shutters, + /obj/machinery/door/window/eastright, + /obj/machinery/door/window/eastleft, + /obj/machinery/door/window/northleft, + /obj/machinery/door/window/northright, + /obj/machinery/door/airlock/external, + /obj/machinery/door/airlock, + /obj/machinery/door/airlock/hatch, + /obj/machinery/door/airlock/engineering/glass/critical, + /obj/machinery/door/airlock/atmos, + /obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks + /obj/structure/window/plasma/reinforced/fulltile/unanchored anchored = FALSE @@ -875,7 +969,7 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) /obj/machinery/door/airlock/hatch, /obj/machinery/door/airlock/engineering/glass/critical, /obj/machinery/door/airlock/atmos, - /obj/machinery/door/airlock/highsecurity,) + /obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks level = 3 glass_amount = 2 @@ -1046,6 +1140,52 @@ GLOBAL_LIST_EMPTY(electrochromatic_window_lookup) level = 3 glass_type = /obj/item/stack/sheet/plastitaniumglass glass_amount = 2 + canSmoothWith = list( + /turf/closed/wall, + /turf/closed/wall/r_wall, + /obj/structure/falsewall, + /obj/structure/falsewall/brass, + /obj/structure/falsewall/reinforced, + /turf/closed/wall/rust, + /turf/closed/wall/r_wall/rust, + /turf/closed/wall/clockwork, + /turf/closed/indestructible/riveted/, + /turf/closed/indestructible/riveted/uranium, + /obj/structure/window/fulltile, + /obj/structure/window/reinforced/fulltile, + /obj/structure/window/reinforced/tinted/fulltile, + /obj/machinery/door, + /obj/machinery/door/airlock/, + /obj/machinery/door/airlock/mining, + /obj/machinery/door/airlock/mining/glass, + /obj/machinery/door/airlock/medical, + /obj/machinery/door/airlock/medical/glass, + /obj/machinery/door/airlock/public, + /obj/machinery/door/airlock/public/glass, + /obj/machinery/door/airlock/research, + /obj/machinery/door/airlock/research/glass, + /obj/machinery/door/airlock/maintenance, + /obj/machinery/door/airlock/maintenance/glass, + /obj/machinery/door/airlock/command/, + /obj/machinery/door/airlock/command/glass, + /obj/machinery/door/airlock/engineering, + /obj/machinery/door/airlock/engineering/glass, + /obj/machinery/door/airlock/engineering/abandoned, + /obj/machinery/door/airlock/security, + /obj/machinery/door/airlock/security/glass, + /obj/machinery/door/airlock/maintenance/abandoned, + /obj/machinery/door/poddoor/shutters/preopen, + /obj/machinery/door/poddoor/shutters, + /obj/machinery/door/window/eastright, + /obj/machinery/door/window/eastleft, + /obj/machinery/door/window/northleft, + /obj/machinery/door/window/northright, + /obj/machinery/door/airlock/external, + /obj/machinery/door/airlock, + /obj/machinery/door/airlock/hatch, + /obj/machinery/door/airlock/engineering/glass/critical, + /obj/machinery/door/airlock/atmos, + /obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks /obj/structure/window/plastitanium/unanchored anchored = FALSE diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index 96ce593470..d02cf49fc9 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -314,6 +314,7 @@ to_chat(user, "You build an airlock.") var/obj/machinery/door/airlock/A = new the_rcd.airlock_type(src) + A.setDir(the_rcd.airlock_dir) //GS13 - directional airlocks edit A.electronics = new/obj/item/electronics/airlock(A) if(the_rcd.conf_access) diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/simulated/wall/misc_walls.dm index 4ec2fa2357..5edb35f9f0 100644 --- a/code/game/turfs/simulated/wall/misc_walls.dm +++ b/code/game/turfs/simulated/wall/misc_walls.dm @@ -186,7 +186,53 @@ /turf/closed/wall/rust name = "rusted wall" desc = "A rusted metal wall." - icon = 'icons/turf/walls/rusty_wall.dmi' + icon = 'GainStation13/icons/turf/walls/rusty_wall.dmi' //GS13 - perspective walls + canSmoothWith = list( + /turf/closed/wall, + /turf/closed/wall/r_wall, + /obj/structure/falsewall, + /obj/structure/falsewall/brass, + /obj/structure/falsewall/reinforced, + /turf/closed/wall/rust, + /turf/closed/wall/r_wall/rust, + /turf/closed/wall/clockwork, + /turf/closed/indestructible/riveted/, + /turf/closed/indestructible/riveted/uranium, + /obj/structure/window/fulltile, + /obj/structure/window/reinforced/fulltile, + /obj/structure/window/reinforced/tinted/fulltile, + /obj/machinery/door, + /obj/machinery/door/airlock/, + /obj/machinery/door/airlock/mining, + /obj/machinery/door/airlock/mining/glass, + /obj/machinery/door/airlock/medical, + /obj/machinery/door/airlock/medical/glass, + /obj/machinery/door/airlock/public, + /obj/machinery/door/airlock/public/glass, + /obj/machinery/door/airlock/research, + /obj/machinery/door/airlock/research/glass, + /obj/machinery/door/airlock/maintenance, + /obj/machinery/door/airlock/maintenance/glass, + /obj/machinery/door/airlock/command/, + /obj/machinery/door/airlock/command/glass, + /obj/machinery/door/airlock/engineering, + /obj/machinery/door/airlock/engineering/glass, + /obj/machinery/door/airlock/engineering/abandoned, + /obj/machinery/door/airlock/security, + /obj/machinery/door/airlock/security/glass, + /obj/machinery/door/airlock/maintenance/abandoned, + /obj/machinery/door/poddoor/shutters/preopen, + /obj/machinery/door/poddoor/shutters, + /obj/machinery/door/window/eastright, + /obj/machinery/door/window/eastleft, + /obj/machinery/door/window/northleft, + /obj/machinery/door/window/northright, + /obj/machinery/door/airlock/external, + /obj/machinery/door/airlock, + /obj/machinery/door/airlock/hatch, + /obj/machinery/door/airlock/engineering/glass/critical, + /obj/machinery/door/airlock/atmos, + /obj/machinery/door/airlock/highsecurity,) //GS13 - directional wall sprites will smooth with windows/airlocks hardness = 45 /turf/closed/wall/rust/rust_heretic_act() diff --git a/code/modules/antagonists/disease/disease_event.dm b/code/modules/antagonists/disease/disease_event.dm index 31ab9d8d33..c403280377 100644 --- a/code/modules/antagonists/disease/disease_event.dm +++ b/code/modules/antagonists/disease/disease_event.dm @@ -3,7 +3,7 @@ name = "Spawn Sentient Disease" typepath = /datum/round_event/ghost_role/sentient_disease weight = 7 - max_occurrences = 1 + max_occurrences = 0 //GS13 - removed midround pseudo-antags min_players = 5 category = EVENT_CATEGORY_HEALTH description = "Spawns a sentient disease, who wants to infect as many people as possible." diff --git a/code/modules/antagonists/revenant/revenant_spawn_event.dm b/code/modules/antagonists/revenant/revenant_spawn_event.dm index b188e0c79c..655a116b7f 100644 --- a/code/modules/antagonists/revenant/revenant_spawn_event.dm +++ b/code/modules/antagonists/revenant/revenant_spawn_event.dm @@ -4,7 +4,7 @@ name = "Spawn Revenant" // Did you mean 'griefghost'? typepath = /datum/round_event/ghost_role/revenant weight = 7 - max_occurrences = 1 + max_occurrences = 0 //GS13 tweak - no antags, thanks min_players = 5 category = EVENT_CATEGORY_ENTITIES description = "Spawns an angry, soul sucking ghost." diff --git a/code/modules/antagonists/slaughter/slaughterevent.dm b/code/modules/antagonists/slaughter/slaughterevent.dm index 8d1f92faac..bc9b1fb6ff 100644 --- a/code/modules/antagonists/slaughter/slaughterevent.dm +++ b/code/modules/antagonists/slaughter/slaughterevent.dm @@ -2,7 +2,7 @@ name = "Spawn Slaughter Demon" typepath = /datum/round_event/ghost_role/slaughter weight = 1 //Very rare - max_occurrences = 1 + max_occurrences = 0 //GS13 - no antags, thanks earliest_start = 1 HOURS min_players = 20 category = EVENT_CATEGORY_ENTITIES diff --git a/code/modules/antagonists/swarmer/swarmer_event.dm b/code/modules/antagonists/swarmer/swarmer_event.dm index 460ce687a6..083363a22e 100644 --- a/code/modules/antagonists/swarmer/swarmer_event.dm +++ b/code/modules/antagonists/swarmer/swarmer_event.dm @@ -2,7 +2,7 @@ name = "Spawn Swarmer Shell" typepath = /datum/round_event/spawn_swarmer weight = 7 - max_occurrences = 1 //Only once okay fam + max_occurrences = 0 //GS13 - no antags, thanks earliest_start = 30 MINUTES min_players = 35 dynamic_should_hijack = TRUE diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index 041dd4be96..f7bf2534cd 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -474,11 +474,11 @@ uniform = /obj/item/clothing/under/pants/youngfolksjeans id = /obj/item/card/id -/datum/outfit/beachbum/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source) - ..() - if(visualsOnly) - return - H.dna.add_mutation(STONER) +// /datum/outfit/beachbum/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source) +// ..() +// if(visualsOnly) +// return +// H.dna.add_mutation(STONER) //GS13 - removes the stoner trait, it makes the role almost unplayable /////////////////Officers+Nanotrasen Security////////////////////// diff --git a/code/modules/events/abductor.dm b/code/modules/events/abductor.dm index c539899f0e..d2b136408a 100755 --- a/code/modules/events/abductor.dm +++ b/code/modules/events/abductor.dm @@ -2,7 +2,7 @@ name = "Abductors" typepath = /datum/round_event/ghost_role/abductor weight = 10 - max_occurrences = 1 + max_occurrences = 0 //GS13 - no antags, thanks min_players = 30 dynamic_should_hijack = TRUE category = EVENT_CATEGORY_INVASION diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm index cf94253bbb..6428ed35f9 100644 --- a/code/modules/events/alien_infestation.dm +++ b/code/modules/events/alien_infestation.dm @@ -3,7 +3,7 @@ typepath = /datum/round_event/ghost_role/alien_infestation weight = 5 min_players = 25 - max_occurrences = 1 + max_occurrences = 0 //GS13 - no antags, thanks dynamic_should_hijack = TRUE category = EVENT_CATEGORY_ENTITIES description = "A xenomorph larva spawns on a random vent." diff --git a/code/modules/events/anomaly_bluespace.dm b/code/modules/events/anomaly_bluespace.dm index f058f37da4..e43b3e856d 100644 --- a/code/modules/events/anomaly_bluespace.dm +++ b/code/modules/events/anomaly_bluespace.dm @@ -1,7 +1,7 @@ /datum/round_event_control/anomaly/anomaly_bluespace name = "Anomaly: Bluespace" typepath = /datum/round_event/anomaly/anomaly_bluespace - + min_players = 12 //GS13 - higher pop = more likely to be solved instead of wrecking a whole dep max_occurrences = 1 weight = 5 description = "This anomaly randomly teleports all items and mobs in a large area." diff --git a/code/modules/events/aurora_caelus.dm b/code/modules/events/aurora_caelus.dm index d9e1e25345..716336cc68 100644 --- a/code/modules/events/aurora_caelus.dm +++ b/code/modules/events/aurora_caelus.dm @@ -1,7 +1,7 @@ /datum/round_event_control/aurora_caelus name = "Aurora Caelus" typepath = /datum/round_event/aurora_caelus - max_occurrences = 2 + max_occurrences = 4 //GS13 - pretty lights, why not weight = 4 earliest_start = 20 MINUTES category = EVENT_CATEGORY_FRIENDLY diff --git a/code/modules/events/high_priority_bounty.dm b/code/modules/events/high_priority_bounty.dm index da3bb8fa3d..d3059f3c3f 100644 --- a/code/modules/events/high_priority_bounty.dm +++ b/code/modules/events/high_priority_bounty.dm @@ -1,9 +1,9 @@ /datum/round_event_control/high_priority_bounty name = "High Priority Bounty" typepath = /datum/round_event/high_priority_bounty - max_occurrences = 5 + max_occurrences = 6 //GS13 - because why not weight = 20 - earliest_start = 10 + earliest_start = 10 MINUTES category = EVENT_CATEGORY_BUREAUCRATIC description = "Creates bounties that are three times original worth." diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm index 70b92d071d..82958ff921 100644 --- a/code/modules/events/immovable_rod.dm +++ b/code/modules/events/immovable_rod.dm @@ -10,8 +10,8 @@ In my current plan for it, 'solid' will be defined as anything with density == 1 /datum/round_event_control/immovable_rod name = "Immovable Rod" typepath = /datum/round_event/immovable_rod - min_players = 20 //GS13 - tweaked min players and occurences - max_occurrences = 2 + min_players = 25 //GS13 - tweaked min players and occurences + max_occurrences = 1 //GS13 - one is enough as is var/atom/special_target category = EVENT_CATEGORY_SPACE description = "The station passes through an immovable rod." diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 0fefb43170..bfaa7db936 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -4,7 +4,7 @@ name = "Ion Storm" typepath = /datum/round_event/ion_storm weight = 15 - min_players = 2 + min_players = 5 //GS13 - increasing pop so it's more likely someone has a chance to fix the laws category = EVENT_CATEGORY_AI description = "Gives the AI a new, randomized law." diff --git a/code/modules/events/major_dust.dm b/code/modules/events/major_dust.dm index 9ae5b8939e..f3bbaaf37a 100644 --- a/code/modules/events/major_dust.dm +++ b/code/modules/events/major_dust.dm @@ -1,7 +1,8 @@ /datum/round_event_control/meteor_wave/major_dust name = "Major Space Dust" typepath = /datum/round_event/meteor_wave/major_dust - min_players = 8 //GS13 + min_players = 10 //GS13 - do it when there's more people to fix it around + max_occurrences = 2 //GS13 - limiting the amount of it weight = 8 description = "The station is pelted by sand." diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index 42a122cc08..d22d33a343 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -7,7 +7,7 @@ name = "Meteor Wave: Normal" typepath = /datum/round_event/meteor_wave weight = 4 - min_players = 16 //GS13 - tweaked all meteor waves to nerf them a bit + min_players = 20 //GS13 - tweaked all meteor waves to nerf them a bit max_occurrences = 2 earliest_start = 40 MINUTES category = EVENT_CATEGORY_SPACE @@ -87,7 +87,7 @@ typepath = /datum/round_event/meteor_wave/threatening weight = 5 min_players = 20 - max_occurrences = 1 + max_occurrences = 0 //GS13 - too chaotic earliest_start = 45 MINUTES description = "A meteor wave with higher chance of big meteors." @@ -100,7 +100,7 @@ typepath = /datum/round_event/meteor_wave/catastrophic weight = 7 min_players = 25 - max_occurrences = 1 + max_occurrences = 0 //GS13 - too chaotic earliest_start = 55 MINUTES description = "A meteor wave that might summon a tunguska class meteor." diff --git a/code/modules/events/nightmare.dm b/code/modules/events/nightmare.dm index a1cc9c9029..066552c3a5 100644 --- a/code/modules/events/nightmare.dm +++ b/code/modules/events/nightmare.dm @@ -1,7 +1,7 @@ /datum/round_event_control/nightmare name = "Spawn Nightmare" typepath = /datum/round_event/ghost_role/nightmare - max_occurrences = 1 + max_occurrences = 0 //GS13 - no antags, thanks min_players = 25 dynamic_should_hijack = TRUE category = EVENT_CATEGORY_ENTITIES diff --git a/code/modules/events/operative.dm b/code/modules/events/operative.dm index 53b79a9456..90f571a4d5 100644 --- a/code/modules/events/operative.dm +++ b/code/modules/events/operative.dm @@ -2,7 +2,7 @@ name = "Lone Operative" typepath = /datum/round_event/ghost_role/operative weight = 0 //Admin only - max_occurrences = 0 //GS13 tweak + max_occurrences = 0 //GS13 - just in case category = EVENT_CATEGORY_INVASION description = "A single nuclear operative assaults the station." diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index 3266bb70bf..31eb07080c 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -2,7 +2,7 @@ name = "Space Pirates" typepath = /datum/round_event/pirates weight = 8 - max_occurrences = 1 + max_occurrences = 0 //GS13 - no antags, thanks min_players = 20 earliest_start = 50 MINUTES dynamic_should_hijack = TRUE diff --git a/code/modules/events/portal_storm.dm b/code/modules/events/portal_storm.dm index 1628566557..081a1bce89 100644 --- a/code/modules/events/portal_storm.dm +++ b/code/modules/events/portal_storm.dm @@ -3,6 +3,7 @@ typepath = /datum/round_event/portal_storm/syndicate_shocktroop weight = 2 min_players = 20 + max_occurrences = 0 //GS13 - no antags, thanks earliest_start = 60 MINUTES category = EVENT_CATEGORY_ENTITIES description = "Syndicate troops pour out of portals." diff --git a/code/modules/events/space_dragon.dm b/code/modules/events/space_dragon.dm index 50d7433f4c..c93376ddbf 100644 --- a/code/modules/events/space_dragon.dm +++ b/code/modules/events/space_dragon.dm @@ -2,7 +2,7 @@ name = "Spawn Space Dragon" typepath = /datum/round_event/ghost_role/space_dragon weight = 8 - max_occurrences = 1 + max_occurrences = 0 //GS13 - no antags, thanks min_players = 25 dynamic_should_hijack = TRUE category = EVENT_CATEGORY_ENTITIES diff --git a/code/modules/events/space_ninja.dm b/code/modules/events/space_ninja.dm index 5fd019fa56..7e7ae751af 100644 --- a/code/modules/events/space_ninja.dm +++ b/code/modules/events/space_ninja.dm @@ -1,7 +1,7 @@ /datum/round_event_control/space_ninja name = "Spawn Space Ninja" typepath = /datum/round_event/ghost_role/space_ninja - max_occurrences = 1 + max_occurrences = 0 //GS13 - no antags, thanks weight = 10 earliest_start = 20 MINUTES min_players = 25 diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 9c68add145..5badf86774 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -3,7 +3,7 @@ typepath = /datum/round_event/spacevine weight = 15 max_occurrences = 3 - min_players = 18 + min_players = 15 //GS13 - should be enough players category = EVENT_CATEGORY_ENTITIES description = "Kudzu begins to overtake the station. Might spawn man-traps." diff --git a/code/modules/events/stray_cargo.dm b/code/modules/events/stray_cargo.dm index e77602d71e..71aeb058d5 100644 --- a/code/modules/events/stray_cargo.dm +++ b/code/modules/events/stray_cargo.dm @@ -3,7 +3,7 @@ name = "Stray Cargo Pod" typepath = /datum/round_event/stray_cargo weight = 5 - max_occurrences = 6 + max_occurrences = 6 //GS13 - increase the amount of possible strays earliest_start = 10 MINUTES category = EVENT_CATEGORY_BUREAUCRATIC description = "A pod containing a random supply crate lands on the station." diff --git a/code/modules/events/supernova.dm b/code/modules/events/supernova.dm index 6549d4c591..ea1e48898a 100644 --- a/code/modules/events/supernova.dm +++ b/code/modules/events/supernova.dm @@ -2,7 +2,7 @@ name = "Supernova" typepath = /datum/round_event/supernova weight = 5 - max_occurrences = 0 + max_occurrences = 0 //GS13 - fuck no (this is just more intense radstorm) min_players = 2 category = EVENT_CATEGORY_SPACE description = "Several modified radstorms hit the station." diff --git a/code/modules/events/travelling_trader.dm b/code/modules/events/travelling_trader.dm index 98ff3184ae..7be23c215f 100644 --- a/code/modules/events/travelling_trader.dm +++ b/code/modules/events/travelling_trader.dm @@ -2,7 +2,7 @@ name = "Travelling Trader" typepath = /datum/round_event/travelling_trader weight = 8 - max_occurrences = 6 //GS13 because why not + max_occurrences = 6 //GS13 - more occurences, because why not earliest_start = 10 MINUTES category = EVENT_CATEGORY_FRIENDLY description = "A mysterious figure requests something to the crew and rewards them with something for getting it done." diff --git a/code/modules/events/untie_shoes.dm b/code/modules/events/untie_shoes.dm index 17dd2ca8b2..04f0da14d4 100644 --- a/code/modules/events/untie_shoes.dm +++ b/code/modules/events/untie_shoes.dm @@ -2,7 +2,7 @@ name = "Untied Shoes" typepath = /datum/round_event/untied_shoes weight = 50 - max_occurrences = 10 + max_occurrences = 0 //GS13 - tedious, doesn't always make sense alert_observers = FALSE category = EVENT_CATEGORY_HEALTH description = "Unties people's shoes, with a chance to knot them as well." diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm index de23b9347d..ee5f4e83f3 100644 --- a/code/modules/events/vent_clog.dm +++ b/code/modules/events/vent_clog.dm @@ -2,8 +2,8 @@ name = "Clogged Vents: Normal" typepath = /datum/round_event/vent_clog weight = 10 - max_occurrences = 3 - min_players = 10 + max_occurrences = 2 //GS13 - pain in the ass, occurences nerfed until a less disruptive variant is made + min_players = 16 //GS13 - pain in the ass, occurences nerfed until a less disruptive variant is made category = EVENT_CATEGORY_HEALTH description = "All the scrubbers onstation spit random chemicals in smoke form." diff --git a/code/modules/jobs/job_types/prisoner.dm b/code/modules/jobs/job_types/prisoner.dm index 732ac03016..49056581f9 100644 --- a/code/modules/jobs/job_types/prisoner.dm +++ b/code/modules/jobs/job_types/prisoner.dm @@ -4,8 +4,8 @@ department_head = list("The Security Team") department_flag = CIVILIAN faction = "Station" - total_positions = 0 - spawn_positions = 0 + total_positions = 1 //GS13 - enabling prisoner (for now) + spawn_positions = 1 //GS13 - enabling prisoner (for now) supervisors = "the security team" random_spawns_possible = FALSE diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index facb34db47..800f050152 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -168,7 +168,7 @@ heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS hoodtype = /obj/item/clothing/head/hooded/explorer/heva armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 20, BIO = 100, RAD = 80, FIRE = 100, ACID = 80) - resistance_flags = FIRE_PROOF | GOLIATH_WEAKNESS + resistance_flags = FIRE_PROOF /obj/item/clothing/head/hooded/explorer/heva name = "HEVA hood" @@ -178,7 +178,7 @@ item_state = "heva" flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 20, BIO = 100, RAD = 20, FIRE = 60, ACID = 20) - resistance_flags = FIRE_PROOF | GOLIATH_WEAKNESS + resistance_flags = FIRE_PROOF /obj/item/clothing/head/hooded/explorer/heva/equipped(mob/living/carbon/human/user, slot) ..() diff --git a/code/modules/mob/living/simple_animal/gremlin/gremlin_event.dm b/code/modules/mob/living/simple_animal/gremlin/gremlin_event.dm index 9c4becbdcf..462c826df9 100644 --- a/code/modules/mob/living/simple_animal/gremlin/gremlin_event.dm +++ b/code/modules/mob/living/simple_animal/gremlin/gremlin_event.dm @@ -4,7 +4,7 @@ weight = 15 max_occurrences = 2 earliest_start = 20 MINUTES - min_players = 5 + min_players = 8 //GS13 - really annoying on low-lowpop considering they jolt back and forth category = EVENT_CATEGORY_ENTITIES description = "Annoying little creatures go around the station causing havoc and hacking everything." diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index d245b68348..83c0084fbc 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -15,7 +15,7 @@ desc = "Buzzy buzzy bee, stingy sti- Ouch!" icon_state = "" icon_living = "" - icon = 'icons/mob/bees.dmi' + icon = 'GainStation13/icons/mob/bees.dmi' //GS13 sprite change - brings back smaller bees rather than big goofy ones gender = FEMALE speak_emote = list("buzzes") emote_hear = list("buzzes") @@ -100,7 +100,7 @@ add_overlay("[icon_base]_base") var/static/mutable_appearance/greyscale_overlay - greyscale_overlay = greyscale_overlay || mutable_appearance('icons/mob/bees.dmi') + greyscale_overlay = greyscale_overlay || mutable_appearance('GainStation13/icons/mob/bees.dmi') //GS13 sprite change - brings back smaller bees rather than big goofy ones greyscale_overlay.icon_state = "[icon_base]_grey" greyscale_overlay.color = col add_overlay(greyscale_overlay) @@ -255,7 +255,7 @@ desc = "She's the queen of bees, BZZ BZZ!" icon_state = "queen_item" item_state = "" - icon = 'icons/mob/bees.dmi' + icon = 'GainStation13/icons/mob/bees.dmi' //GS13 sprite change - brings back smaller bees rather than big goofy ones var/mob/living/simple_animal/hostile/poison/bees/queen/queen diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 081b93866e..7b6e291df5 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -14,7 +14,7 @@ /obj/item/wallframe/light_fixture name = "light fixture frame" desc = "Used for building lights." - icon = 'icons/obj/lighting.dmi' + icon = 'GainStation13/icons/obj/lighting.dmi' //GS13 - sprite change icon_state = "tube-construct-item" result_path = /obj/structure/light_construct inverse = TRUE @@ -38,7 +38,7 @@ /obj/structure/light_construct name = "light fixture frame" desc = "A light fixture under construction." - icon = 'icons/obj/lighting.dmi' + icon = 'GainStation13/icons/obj/lighting.dmi' //GS13 - sprite change icon_state = "tube-construct-stage1" anchored = TRUE layer = WALL_OBJ_LAYER @@ -178,7 +178,7 @@ // the standard tube light fixture /obj/machinery/light name = "light fixture" - icon = 'icons/obj/lighting.dmi' + icon = 'GainStation13/icons/obj/lighting.dmi' //GS13 - sprite change var/overlayicon = 'icons/obj/lighting_overlay.dmi' var/base_state = "tube" // base description and icon_state icon_state = "tube" @@ -733,7 +733,7 @@ // will fit into empty /obj/machinery/light of the corresponding type /obj/item/light - icon = 'icons/obj/lighting.dmi' + icon = 'GainStation13/icons/obj/lighting.dmi' //GS13 - sprite change force = 2 throwforce = 5 w_class = WEIGHT_CLASS_TINY @@ -839,7 +839,7 @@ /obj/machinery/light/floor name = "floor light" - icon = 'icons/obj/lighting.dmi' + icon = 'GainStation13/icons/obj/lighting.dmi' //GS13 - sprite change base_state = "floor" // base description and icon_state icon_state = "floor" brightness = 5 diff --git a/hyperstation/code/datums/components/crafting/bounties.dm b/hyperstation/code/datums/components/crafting/bounties.dm index e6fd87b94f..14ea210f4d 100644 --- a/hyperstation/code/datums/components/crafting/bounties.dm +++ b/hyperstation/code/datums/components/crafting/bounties.dm @@ -65,7 +65,7 @@ datum/bounty/lewd/fluid/New() //GS13 made some edits here that changes stuff int reagent_type = /datum/reagent/consumable/milk wanted_reagent = new reagent_type name = wanted_reagent.name - description = "The GATO annual bake sale is soon, and all of our milk has expired. Help us out." + description = "The GATO annual bake sale is soon, and all of our milk has expired. Help us out." //GS13 reward += rand(10, 17) * 500 //Milk is generally easier to get. Make the reward a little lower. if(15,16) //A little romance var/static/list/possible_reagents = list(\ @@ -84,7 +84,7 @@ datum/bounty/lewd/fluid/New() //GS13 made some edits here that changes stuff int reagent_type = /datum/reagent/consumable/lipoifier wanted_reagent = new reagent_type name = wanted_reagent.name - description = "The quality of GATO's meat-related products have diminished. Send us some lipoifier to help with meat production." + description = "The quality of GATO's meat-related products have diminished. Send us some lipoifier to help with meat production." //GS13 reward += rand(2, 7) * 500 /* //Just not getting this to work. diff --git a/hyperstation/code/modules/events/crystalline_reentry.dm b/hyperstation/code/modules/events/crystalline_reentry.dm index f3a6d1e05a..029a08c110 100644 --- a/hyperstation/code/modules/events/crystalline_reentry.dm +++ b/hyperstation/code/modules/events/crystalline_reentry.dm @@ -2,7 +2,7 @@ name = "Crystalline Asteroid" typepath = /datum/round_event/crystalline_reentry min_players = 15 - max_occurrences = 5 + max_occurrences = 0 //GS13 - removed... for now var/atom/special_target /datum/round_event_control/crystalline_reentry/admin_setup() @@ -253,7 +253,7 @@ var/turf/open/chasm/cloud/M = F M.TerraformTurf(/turf/open/floor/plating/asteroid/layenia, /turf/open/floor/plating/asteroid/layenia) gps = new /obj/item/gps/internal(src) - addtimer(CALLBACK(src,PROC_REF(delayedInitialize)), 4 SECONDS) + addtimer(CALLBACK(src,PROC_REF(delayedInitialize)), 4 SECONDS) /obj/structure/spawner/crystalline/deconstruct(disassembled) new /obj/effect/cloud_collapse(loc)