diff --git a/Build.bat b/Build.bat index 21afda3467..430bd08c64 100644 --- a/Build.bat +++ b/Build.bat @@ -2,3 +2,7 @@ call "%~dp0\tools\build\build.bat" %* rem pause rem pausing is just annoying, don't + +:: Below code added by Lucky on 12/5/24, to let me review errors and delay window closing. +echo Press any key to close this window. +pause > nul diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 60ed371fd0..39f969065f 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -84,7 +84,4 @@ name = "boritos bag" icon_state = "boritos" grind_results = list(/datum/reagent/aluminium = 1) //from the mylar bag - -/obj/item/trash/sfseeds - name = "\improper Old Glory sunflower seeds" - icon_state = "sfseeds" \ No newline at end of file + \ No newline at end of file diff --git a/code/modules/food_and_drinks/food/snacks_vend.dm b/code/modules/food_and_drinks/food/snacks_vend.dm index 832511662e..4e8687fc23 100644 --- a/code/modules/food_and_drinks/food/snacks_vend.dm +++ b/code/modules/food_and_drinks/food/snacks_vend.dm @@ -101,14 +101,3 @@ filling_color = "#97ee63" tastes = list("pure electricity" = 3, "fitness" = 2) foodtype = TOXIC - -/obj/item/reagent_containers/food/snacks/sfseeds - name = "\improper Old Glory sunflower seeds" - icon_state = "sfseeds" - desc = "Sunflower seeds grown in the land of the free." - trash = /obj/item/trash/sfseeds - list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sodiumchloride = 3) - junkiness = 20 - filling_color = "##BCAAA4" - tastes = list("americana" = 1) - foodtype = JUNKFOOD \ No newline at end of file diff --git a/code/modules/jobs/job_titles.dm b/code/modules/jobs/job_titles.dm index 8658727c9e..a230fc4d31 100644 --- a/code/modules/jobs/job_titles.dm +++ b/code/modules/jobs/job_titles.dm @@ -93,7 +93,7 @@ //Command /datum/job/captain - alt_titles = list("Station Director", "Station Commander", "Station Overseer", "Stationmaster", "Commissar", "Catpain") + alt_titles = list("Station Director", "Station Commander", "Station Overseer", "Stationmaster", "Commissar") /datum/job/hop alt_titles = list("Personnel Manager", "Staff Administrator", "Records Administrator") diff --git a/code/modules/language/nyanese.dm b/code/modules/language/nyanese.dm deleted file mode 100644 index c671aeca71..0000000000 --- a/code/modules/language/nyanese.dm +++ /dev/null @@ -1,20 +0,0 @@ -/datum/language/nyanese - name = "Nyanese" - desc = "The intergalatic language of felines, it is often used to annoy gods." - speech_verb = "meows" - ask_verb = "mrrps" - exclaim_verb = "mrowls" - key = "f" - flags = TONGUELESS_SPEECH - space_chance = 100 - syllables = list( - "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Mrrp", "Hiss", "Prrr", "Myaa", "Mrow", "Nyah", "Rrrt", "Purr", "Yow", -"Murrr", "Nyaa", "Mii", "Meeoo", "Rrraow", "Chrr", "Mrrrr", "Myaow", "Mrawr", "Mrowl", -"Meeeow", "Nyrrrr", "Rrrrrooo", "Hrrrrt", "Meeew", "Mieow", "Raaow", "Meerp", "Ryaa", "Hrrrawr" - - ) - icon_state = "feline" - default_priority = 75 - //SKYRAT CHANGE - language restriction - restricted = FALSE - // diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm index 3ed6e6b25b..1ec80d8f13 100644 --- a/code/modules/surgery/organs/tongue.dm +++ b/code/modules/surgery/organs/tongue.dm @@ -28,7 +28,6 @@ /datum/language/dwarf, /datum/language/signlanguage, /datum/language/neokanji, - /datum/language/nyanese, /datum/language/sylvan, /datum/language/machine, //Skyrat change - adds machine language /datum/language/modular_sand/calcic, //Skyrat change - plasmaman language @@ -39,6 +38,7 @@ /datum/language/modular_sand/technorussian, //Skyrat change - russian stereotype language /datum/language/modular_sand/sergal, //Sandstorm change /datum/language/modular_splurt/avian, //SPLURT change - peep peep! + /datum/language/modular_splurt/nyanese, //SPLURT change - meow meow! )) healing_factor = STANDARD_ORGAN_HEALING*5 //Fast!! decay_factor = STANDARD_ORGAN_DECAY/2 diff --git a/code/modules/vending/snack.dm b/code/modules/vending/snack.dm index 7cab89d912..c85ec8a594 100644 --- a/code/modules/vending/snack.dm +++ b/code/modules/vending/snack.dm @@ -14,8 +14,7 @@ /obj/item/reagent_containers/food/snacks/spacetwinkie = 5, /obj/item/reagent_containers/food/snacks/cheesiehonkers = 5, /obj/item/reagent_containers/food/snacks/cornchips = 5, - /obj/item/reagent_containers/food/snacks/energybar = 6, - /obj/item/reagent_containers/food/snacks/sfseeds = 5) + /obj/item/reagent_containers/food/snacks/energybar = 6) contraband = list( /obj/item/reagent_containers/food/snacks/cracker = 10, /obj/item/reagent_containers/food/snacks/honeybar = 5, diff --git a/icons/misc/language.dmi b/icons/misc/language.dmi index 8de834744e..b24e9871c3 100644 Binary files a/icons/misc/language.dmi and b/icons/misc/language.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index 06bcdc25ba..15afa25006 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index 187836b39b..74ec511768 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ diff --git a/modular_splurt/code/game/objects/items/trash.dm b/modular_splurt/code/game/objects/items/trash.dm new file mode 100644 index 0000000000..a142c3bc81 --- /dev/null +++ b/modular_splurt/code/game/objects/items/trash.dm @@ -0,0 +1,18 @@ +//Added by Jack Rost! (and lucky now :3) +/obj/item/trash + icon = 'icons/obj/janitor.dmi' + lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + desc = "This is rubbish." + w_class = WEIGHT_CLASS_TINY + resistance_flags = FLAMMABLE + +/obj/item/trash/Initialize(mapload) + . = ..() + AddElement(/datum/element/trash) + +/obj/item/trash/sfseeds + name = "\improper Old Glory sunflower seeds" + icon_state = "sfseeds" + icon = 'modular_splurt/icons/obj/janitor.dmi' + \ No newline at end of file diff --git a/modular_splurt/code/modules/food_and_drinks/food/snacks_vend.dm b/modular_splurt/code/modules/food_and_drinks/food/snacks_vend.dm index 81e83857fd..fb6c65a8b9 100644 --- a/modular_splurt/code/modules/food_and_drinks/food/snacks_vend.dm +++ b/modular_splurt/code/modules/food_and_drinks/food/snacks_vend.dm @@ -192,3 +192,16 @@ icon_state = "bean_bagopen" else icon_state = "bean_bag" + +/obj/item/reagent_containers/food/snacks/sfseeds + name = "\improper Old Glory sunflower seeds" + icon_state = "sfseeds" + icon = 'modular_splurt/icons/obj/food/food.dmi' + desc = "Sunflower seeds grown in the land of the free." + trash = /obj/item/trash/sfseeds + list_reagents = list(/datum/reagent/consumable/nutriment = 2, /datum/reagent/consumable/sodiumchloride = 3) + junkiness = 20 + filling_color = "##BCAAA4" + tastes = list("americana" = 1) + foodtype = JUNKFOOD + \ No newline at end of file diff --git a/modular_splurt/code/modules/jobs/job_types/_job_alt_titles.dm b/modular_splurt/code/modules/jobs/job_types/_job_alt_titles.dm index 57c380f601..0466426646 100644 --- a/modular_splurt/code/modules/jobs/job_types/_job_alt_titles.dm +++ b/modular_splurt/code/modules/jobs/job_types/_job_alt_titles.dm @@ -11,7 +11,8 @@ "Senator", "Consul", "Cap-Slut", - "Condom" + "Condom", + "Catpain" ) LAZYADD(alt_titles, extra_titles) . = ..() diff --git a/modular_splurt/code/modules/language/language.dm b/modular_splurt/code/modules/language/language.dm index 97c5dedeee..843c7b3caf 100644 --- a/modular_splurt/code/modules/language/language.dm +++ b/modular_splurt/code/modules/language/language.dm @@ -19,3 +19,29 @@ flags = TONGUELESS_SPEECH icon_state = "birb" restricted = FALSE + +/datum/language/modular_splurt/nyanese + name = "Nyanese" + desc = "The intergalatic language of felines, often used to annoy gods." + speech_verb = "meows" + ask_verb = "mrrps" + exclaim_verb = "mrowls" + key = "f" + flags = TONGUELESS_SPEECH + space_chance = 100 + syllables = list( + "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Mrrp", "Hiss", "Prrr", "Myaa", "Mrow", "Nyah", "Rrrt", "Purr", "Yow", +"Murrr", "Meow", "Nyaa", "Meow", "Mii", "Meeoo", "Meow", "Rrraow", "Chrr", "Mrrrr", "Myaow", "Mrawr", "Mrowl", +"Meeeow", "Nyrrrr", "Rrrrrooo", "Meow", "Hrrrrt", "Meeew","Meow", "Mieow", "Raaow", "Meerp", "Meow", "Ryaa", "Meow", "Hrrrawr", +"Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", +"Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow", +"Meow", "Meow", "Meow", "Meow", "Meow", "Meow", "Meow" + + ) + icon_state = "feline" + icon = 'modular_splurt/icons/misc/language.dmi' + default_priority = 75 + //SKYRAT CHANGE - language restriction + restricted = FALSE + // + \ No newline at end of file diff --git a/modular_splurt/code/modules/vending/snack.dm b/modular_splurt/code/modules/vending/snack.dm index 66f2bdc805..fa4715aef7 100644 --- a/modular_splurt/code/modules/vending/snack.dm +++ b/modular_splurt/code/modules/vending/snack.dm @@ -1,6 +1,7 @@ /obj/machinery/vending/snack/Initialize(mapload) var/list/extra_products = list( - /obj/item/storage/fancy/jellybean_bowl = 5 + /obj/item/storage/fancy/jellybean_bowl = 5, + /obj/item/reagent_containers/food/snacks/sfseeds = 5 ) LAZYADD(products, extra_products) . = ..() diff --git a/modular_splurt/icons/misc/language.dmi b/modular_splurt/icons/misc/language.dmi index c4726eee15..894081a2d8 100644 Binary files a/modular_splurt/icons/misc/language.dmi and b/modular_splurt/icons/misc/language.dmi differ diff --git a/modular_splurt/icons/obj/food/food.dmi b/modular_splurt/icons/obj/food/food.dmi index 10730b723f..79125773c2 100644 Binary files a/modular_splurt/icons/obj/food/food.dmi and b/modular_splurt/icons/obj/food/food.dmi differ diff --git a/modular_splurt/icons/obj/janitor.dmi b/modular_splurt/icons/obj/janitor.dmi index ae176c890d..d12390efd6 100644 Binary files a/modular_splurt/icons/obj/janitor.dmi and b/modular_splurt/icons/obj/janitor.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 75fe6cd2dd..62153bd3a8 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -2633,7 +2633,6 @@ #include "code\modules\language\mushroom.dm" #include "code\modules\language\narsian.dm" #include "code\modules\language\neokanji.dm" -#include "code\modules\language\nyanese.dm" #include "code\modules\language\ratvarian.dm" #include "code\modules\language\signlanguage.dm" #include "code\modules\language\slime.dm" @@ -4647,6 +4646,7 @@ #include "modular_splurt\code\game\objects\items\RCD.dm" #include "modular_splurt\code\game\objects\items\RTL.dm" #include "modular_splurt\code\game\objects\items\toys.dm" +#include "modular_splurt\code\game\objects\items\trash.dm" #include "modular_splurt\code\game\objects\items\weaponry.dm" #include "modular_splurt\code\game\objects\items\carvingstones\carvingstones.dm" #include "modular_splurt\code\game\objects\items\circuitboards\computer_circuitboards.dm"