From 520941320457a7b87b3420cd2b6823d4aec67a5f Mon Sep 17 00:00:00 2001 From: DynaJ0ule <117537167+DynaJ0ule@users.noreply.github.com> Date: Mon, 6 Feb 2023 12:31:43 -0500 Subject: [PATCH] Merge branch 'origin/HEAD' --- .gitignore | 1 + .vscode/launch.json | 11 +- GainStation13/code/mobs/unusualtentical.dm | 1 - .../code/modules/mob/living/emote.dm | 97 +- .../chemistry/reagents/consumable_reagents.dm | 3 +- .../code/modules/vending/gatocola.dm | 6 +- GainStation13/code/modules/vending/mealdor.dm | 10 +- GainStation13/icons/obj/scale.dmi | Bin 354 -> 838 bytes .../lavaland_surface_snack_store.dmm | 1785 +++++++++++++++++ _maps/RandomRuins/SpaceRuins/fastfood.dmm | 467 +++++ _maps/RandomRuins/SpaceRuins/feeders_den.dmm | 286 +++ .../SpaceRuins/listeningstation.dmm | 3 +- _maps/RandomZLevels/Outfats.dmm | 288 ++- _maps/RandomZLevels/caves.dmm | 4 +- _maps/map_files/BoxStation/BoxStation.dmm | 27 +- _maps/map_files/MetaStation/MetaStation.dmm | 203 +- _maps/map_files/Mining/Lavaland_Demone.dmm | 167 +- _maps/map_files/Mining/Lavaland_Lower.dmm | 91 +- _maps/map_files/OmegaStation/OmegaStation.dmm | 117 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 117 +- _maps/map_files/generic/CentCom.dmm | 146 +- code/__DEFINES/construction.dm | 3 +- code/__DEFINES/misc.dm | 9 + code/__DEFINES/mobs.dm | 10 +- code/__DEFINES/traits.dm | 4 + code/datums/components/material_container.dm | 6 + code/datums/components/remote_materials.dm | 2 +- code/datums/diseases/advance/advance.dm | 16 +- code/datums/diseases/advance/presets.dm | 5 +- .../diseases/advance/symptoms/species.dm | 16 + code/datums/ruins/lavaland.dm | 9 + code/datums/ruins/space.dm | 12 + code/datums/weather/weather_types/layenia.dm | 4 + .../weather/weather_types/radiation_storm.dm | 112 +- .../dynamic/dynamic_rulesets_events.dm | 112 +- code/game/machinery/recycler.dm | 2 +- code/game/objects/effects/contraband.dm | 42 +- .../objects/items/stacks/sheets/mineral.dm | 28 +- .../items/stacks/tiles/tile_mineral.dm | 26 +- .../objects/items/stacks/tiles/tile_types.dm | 8 + .../crates_lockers/closets/syndicate.dm | 1 + .../objects/structures/door_assembly_types.dm | 9 + code/game/objects/structures/false_walls.dm | 37 + code/game/objects/structures/statues.dm | 95 + .../game/turfs/simulated/floor/fancy_floor.dm | 5 + .../turfs/simulated/floor/mineral_floor.dm | 38 +- code/game/turfs/simulated/minerals.dm | 14 +- .../turfs/simulated/wall/mineral_walls.dm | 36 + code/modules/antagonists/cult/runes.dm | 6 +- .../antagonists/disease/disease_abilities.dm | 18 +- .../nukeop/equipment/nuclear_challenge.dm | 2 +- .../nukeop/equipment/nuclearbomb.dm | 4 +- code/modules/awaymissions/corpse.dm | 137 ++ code/modules/cargo/exports/large_objects.dm | 5 + code/modules/cargo/packs/misc.dm | 2 + code/modules/clothing/suits/miscellaneous.dm | 8 +- code/modules/events/disease_outbreak.dm | 2 +- code/modules/events/heart_attack.dm | 6 +- code/modules/events/radiation_storm.dm | 28 +- .../events/spontaneous_appendicitis.dm | 8 +- .../food_and_drinks/food/snacks_pastry.dm | 2 +- .../integrated_electronics/subtypes/input.dm | 7 +- .../subtypes/manipulation.dm | 6 +- code/modules/mining/machine_processing.dm | 2 +- code/modules/mining/machine_redemption.dm | 2 +- code/modules/mining/machine_silo.dm | 2 +- code/modules/mining/minebot.dm | 2 +- code/modules/mining/mint.dm | 2 +- code/modules/mining/ores_coins.dm | 9 + .../mob/living/carbon/human/species.dm | 308 ++- .../carbon/human/species_types/podpeople.dm | 36 +- code/modules/paperwork/contract.dm | 2 +- .../chemistry/reagents/other_reagents.dm | 12 + .../reagents/chemistry/recipes/others.dm | 9 +- .../ruins/spaceruin_code/feeders_den.dm | 21 + code/modules/vending/clothesmate.dm | 1 + config/custom_roundstart_items.txt | 6 +- config/game_options.txt | 16 +- config/lavaRuinBlacklist.txt | 1 + config/spaceRuinBlacklist.txt | 2 + html/changelog.html | 10 +- .../code/datums/weather/oxygen_rain.dm | 3 + hyperstation/icons/obj/genitals/belly.dmi | Bin 7672 -> 49641 bytes hyperstation/icons/obj/genitals/butt.dmi | Bin 2714 -> 43986 bytes icons/effects/ore_visuals.dmi | Bin 23454 -> 28887 bytes icons/mob/human_face.dmi | Bin 177348 -> 177299 bytes icons/mob/suit.dmi | Bin 452698 -> 448804 bytes icons/obj/bedsheets.dmi | Bin 16820 -> 16966 bytes icons/obj/clothing/suits.dmi | Bin 151156 -> 152755 bytes icons/obj/contraband.dmi | Bin 69869 -> 75733 bytes icons/obj/food/food.dmi | Bin 75859 -> 75766 bytes icons/obj/janitor.dmi | Bin 28973 -> 28887 bytes icons/obj/mining.dmi | Bin 62688 -> 63367 bytes icons/obj/stack_objects.dmi | Bin 44320 -> 45430 bytes icons/obj/statue.dmi | Bin 22088 -> 32992 bytes icons/obj/supplypods.dmi | Bin 55305 -> 55248 bytes icons/obj/tiles.dmi | Bin 21014 -> 21524 bytes icons/obj/toy.dmi | Bin 39004 -> 39019 bytes icons/turf/floors.dmi | Bin 348497 -> 344571 bytes icons/turf/floors/carpet_gato.dmi | Bin 0 -> 3278 bytes icons/turf/walls/calorite_wall.dmi | Bin 0 -> 2272 bytes .../code/modules/arousal/organs/anus.dm | 32 +- .../code/modules/arousal/organs/genitals.dm | 39 +- .../mob/dead/new_player/sprite_accessories.dm | 4 +- tgstation.dme | 245 +++ .../packages/tgui/public/tgui.bundle.css | 2 +- 106 files changed, 4743 insertions(+), 757 deletions(-) create mode 100644 _maps/RandomRuins/LavaRuins/lavaland_surface_snack_store.dmm create mode 100644 _maps/RandomRuins/SpaceRuins/fastfood.dmm create mode 100644 _maps/RandomRuins/SpaceRuins/feeders_den.dmm create mode 100644 code/modules/ruins/spaceruin_code/feeders_den.dm create mode 100644 icons/turf/floors/carpet_gato.dmi create mode 100644 icons/turf/walls/calorite_wall.dmi diff --git a/.gitignore b/.gitignore index 5cb7d4ae..abd847b8 100644 --- a/.gitignore +++ b/.gitignore @@ -220,3 +220,4 @@ tools/MapAtmosFixer/MapAtmosFixer/bin/* /config/title_screens/images/* !/config/title_screens/images/exclude config/admins.txt +_maps/RandomRuins_SpaceRuins_TheDerelictProject.dmm diff --git a/.vscode/launch.json b/.vscode/launch.json index b07b0107..e2ddd1b4 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -1,12 +1,21 @@ { "version": "0.2.0", "configurations": [ + { "type": "byond", "request": "launch", "name": "Launch DreamSeeker", "preLaunchTask": "dm: build - ${command:CurrentDME}", "dmb": "${workspaceFolder}/${command:CurrentDMB}" - } + }, + { + "type": "byond", + "request": "launch", + "name": "Launch DreamDaemon", + "preLaunchTask": "dm: build - ${command:CurrentDME}", + "dmb": "${workspaceFolder}/${command:CurrentDMB}", + "dreamDaemon": true + }, ] } diff --git a/GainStation13/code/mobs/unusualtentical.dm b/GainStation13/code/mobs/unusualtentical.dm index f6ceff1b..81823e60 100644 --- a/GainStation13/code/mobs/unusualtentical.dm +++ b/GainStation13/code/mobs/unusualtentical.dm @@ -1,4 +1,3 @@ - /obj/code/game/mobs/unusualtentical name = "unusualtentical" desc = "Whats this doing here?" diff --git a/GainStation13/code/modules/mob/living/emote.dm b/GainStation13/code/modules/mob/living/emote.dm index 7d1ada5d..35a21417 100644 --- a/GainStation13/code/modules/mob/living/emote.dm +++ b/GainStation13/code/modules/mob/living/emote.dm @@ -1,60 +1,58 @@ - /datum/emote/living/gurgle key = "gurgle" key_third_person = "gurgles" message = "'s belly gurgles" emote_type = EMOTE_AUDIBLE - /datum/emote/living/gurgle/run_emote(mob/living/user, params) - if(ishuman(user)) - if(prob(50)) - playsound(user, 'GainStation13/sound/voice/gurgle1.ogg', 50, 1, -1) - else - playsound(user, 'GainStation13/sound/voice/gurgle2.ogg', 50, 1, -1) + if(!ishuman(user)) + return FALSE + + if(prob(50)) + playsound(user, 'GainStation13/sound/voice/gurgle1.ogg', 50, 1, -1) + else + playsound(user, 'GainStation13/sound/voice/gurgle2.ogg', 50, 1, -1) + . = ..() /datum/emote/living/burp/run_emote(mob/living/user, params) - if(ishuman(user)) - playsound(user, 'GainStation13/sound/voice/burp1.ogg', 50, 1, -1) + if(!ishuman(user)) + return FALSE + + playsound(user, 'GainStation13/sound/voice/burp1.ogg', 50, 1, -1) . = ..() /datum/emote/living/fart key = "fart" key_third_person = "farts" - message = " farts" + message = "farts" emote_type = EMOTE_AUDIBLE //god hates me for this -Metha /datum/emote/living/fart/run_emote(mob/living/user, params) - if(ishuman(user)) - - var/fartSoundChoice = rand(3) - - switch(fartSoundChoice) - if (0) playsound(user, 'GainStation13/sound/voice/fart3.ogg', 50, 1, -1) - - if (1) playsound(user, 'GainStation13/sound/voice/fart4.ogg', 50, 1, -1) - - if (2) playsound(user, 'GainStation13/sound/voice/fart2.ogg', 50, 1, -1) - - if (3) playsound(user, 'GainStation13/sound/voice/fart1.ogg', 50, 1, -1) - - - - - - . = ..() - + if(!ishuman(user)) + return FALSE + var/fartSoundChoice = rand(3) + switch(fartSoundChoice) + if (0) + playsound(user, 'GainStation13/sound/voice/fart3.ogg', 50, 1, -1) + if (1) + playsound(user, 'GainStation13/sound/voice/fart4.ogg', 50, 1, -1) + if (2) + playsound(user, 'GainStation13/sound/voice/fart2.ogg', 50, 1, -1) + if (3) + playsound(user, 'GainStation13/sound/voice/fart1.ogg', 50, 1, -1) + + . = ..() //Shhh... It's a secret! Don't tell or I'll steal your legs /datum/emote/living/burunyu key = "burunyu" key_third_person = "burunyues" - message = " emits a strange feline sound" + message = "emits a strange feline sound" emote_type = EMOTE_AUDIBLE /datum/emote/living/burunyu/run_emote(mob/living/user, params) @@ -65,29 +63,28 @@ /datum/emote/living/belch key = "belch" key_third_person = "belches loudly" - message = " belches" + message = "belches" emote_type = EMOTE_AUDIBLE - //god hates me for this -Metha /datum/emote/living/belch/run_emote(mob/living/user, params) - if(ishuman(user)) + if(!ishuman(user)) + return FALSE + + var/fartSoundChoice = rand(5) + switch(fartSoundChoice) + if(0) + playsound(user, 'GainStation13/sound/voice/belch3.ogg', 50, 1, -1) + if(1) + playsound(user, 'GainStation13/sound/voice/belch4.ogg', 50, 1, -1) + if(2) + playsound(user, 'GainStation13/sound/voice/belch2.ogg', 50, 1, -1) + if(3) + playsound(user, 'GainStation13/sound/voice/belch1.ogg', 50, 1, -1) + if(4) + playsound(user, 'GainStation13/sound/voice/belch5.ogg', 50, 1, -1) + if(5) + playsound(user, 'GainStation13/sound/voice/belch6.ogg', 50, 1, -1) - var/fartSoundChoice = rand(5) - - switch(fartSoundChoice) - if (0) playsound(user, 'GainStation13/sound/voice/belch3.ogg', 50, 1, -1) - - if (1) playsound(user, 'GainStation13/sound/voice/belch4.ogg', 50, 1, -1) - - if (2) playsound(user, 'GainStation13/sound/voice/belch2.ogg', 50, 1, -1) - - if (3) playsound(user, 'GainStation13/sound/voice/belch1.ogg', 50, 1, -1) - - if (4) playsound(user, 'GainStation13/sound/voice/belch5.ogg', 50, 1, -1) - - if (5) playsound(user, 'GainStation13/sound/voice/belch6.ogg', 50, 1, -1) - - - . = ..() \ No newline at end of file + . = ..() diff --git a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm index 04ece117..28faf8d6 100644 --- a/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm +++ b/GainStation13/code/modules/reagents/chemistry/reagents/consumable_reagents.dm @@ -12,4 +12,5 @@ /datum/reagent/consumable/lipoifier/on_mob_life(mob/living/carbon/M) if(M && !HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE)) M.fatness = M.fatness + 10 - return ..() + + return ..() diff --git a/GainStation13/code/modules/vending/gatocola.dm b/GainStation13/code/modules/vending/gatocola.dm index b8225587..b8d91b9f 100644 --- a/GainStation13/code/modules/vending/gatocola.dm +++ b/GainStation13/code/modules/vending/gatocola.dm @@ -23,10 +23,6 @@ refill_canister = /obj/item/vending_refill/mealdor -obj/item/vending_refill/mealdor +/obj/item/vending_refill/mealdor machine_name = "Meal Vendor Refill" icon_state = "refill_mealdor" - -#define STANDARD_CHARGE 1 -#define CONTRABAND_CHARGE 2 -#define COIN_CHARGE 3 diff --git a/GainStation13/code/modules/vending/mealdor.dm b/GainStation13/code/modules/vending/mealdor.dm index 73a55a8c..22e71a91 100644 --- a/GainStation13/code/modules/vending/mealdor.dm +++ b/GainStation13/code/modules/vending/mealdor.dm @@ -39,7 +39,7 @@ /obj/item/reagent_containers/food/snacks/cookie = 10, /obj/item/reagent_containers/food/snacks/salad/fruit = 15, /obj/item/reagent_containers/food/snacks/salad = 20, - /obj/item/reagent_containers/food/snacks/salad/hellcobb =10, + /obj/item/reagent_containers/food/snacks/salad/hellcobb = 10, /obj/item/clothing/under/cowkini = 5, ) premium = list( @@ -48,11 +48,3 @@ ) refill_canister = /obj/item/vending_refill/mealdor - -obj/item/vending_refill/mealdor - machine_name = "Meal Vendor Refill" - icon_state = "refill_mealdor" - -#define STANDARD_CHARGE 1 -#define CONTRABAND_CHARGE 2 -#define COIN_CHARGE 3 diff --git a/GainStation13/icons/obj/scale.dmi b/GainStation13/icons/obj/scale.dmi index 596cfd2f61a229d0c310282e70d13bacf2cfb1d3..4df41e16b2d8f42c8aba344344c8acd583fabdeb 100644 GIT binary patch delta 827 zcmV-B1H}B|0>%cA7=H)`0001UdV2H#003=zR9JLGWpiV4X>fFDZ*Bkpc$_82y$XOJ z6b8`Q`xGC!M}MnJ7~zobAbCrnA5f{+Z)iJ5Vw`4Up%+6BryTDK3PatHc%v@?3VlZ+ zaNI-rlZz`1g(|P^;EIHgDMO(pu_br%Z;8oj=*7?nHcT25NPh#$m;e9*lu1NER9J=W zmd#F6K@`V-XL@hB^!h;pK^7=TC0#Uuy+(}*x-dS2i3@!PU&VKDgA2pL#JKYTy0}8o zScL{LKx@Bf?>#Ph`&|;yAui;= zZ-Qe+YR(n`0K#Sn3dWdTD{%`Tqcv}jfFPYSCB{Ic7=M!h1;;oioj0*n1MzeMs=Qy{ z00ZyeYyj|X{cZcdo+kl?kA)mdGjl{q1FC~Tjj&z(HsWTDfT|KS_Xzg);<&x#iUZE<2Md3<@dRu(rN$z002ovPDHLk FV1nT7ddvU- delta 339 zcmV-Z0j&PU2I2yc7=Hu<0001iRA?00DGTPE!Ct=GbNc003!vR9JLGWpiV4X>fFDZ*Bkpc$`yKaB_9` z^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDainGjE%TBGg33tGk;1ToZ^zil2jm5sW>?? zCsm1yGbOXA7|1u|;!G<_%uR)`l@(n5T)@Tx05(h-6Sktz$N&HUfJsC_R49>SV4xll z6hz}IDWQlkDj6Fq2_Ojw83TbLvVe(;i!+G=rlFz1_*J0W!l-O)Y=rC%kP>7CASI{@ z7#PG7QTYtwg-mo1U@R{ez%L+HUXJQAvGg*S09yh`M;Z_aKzMBF#lR>417l