Skip to content

Commit

Permalink
Added lines to end of files, modularized previous additions, added us…
Browse files Browse the repository at this point in the history
…er input to close batch file
  • Loading branch information
SpaceCat404 committed Dec 5, 2024
1 parent 0561457 commit e2cd966
Show file tree
Hide file tree
Showing 19 changed files with 70 additions and 42 deletions.
4 changes: 4 additions & 0 deletions Build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 1 addition & 4 deletions code/game/objects/items/trash.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"

11 changes: 0 additions & 11 deletions code/modules/food_and_drinks/food/snacks_vend.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion code/modules/jobs/job_titles.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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")
20 changes: 0 additions & 20 deletions code/modules/language/nyanese.dm

This file was deleted.

2 changes: 1 addition & 1 deletion code/modules/surgery/organs/tongue.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions code/modules/vending/snack.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Binary file modified icons/misc/language.dmi
Binary file not shown.
Binary file modified icons/obj/food/food.dmi
Binary file not shown.
Binary file modified icons/obj/janitor.dmi
Binary file not shown.
18 changes: 18 additions & 0 deletions modular_splurt/code/game/objects/items/trash.dm
Original file line number Diff line number Diff line change
@@ -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'

13 changes: 13 additions & 0 deletions modular_splurt/code/modules/food_and_drinks/food/snacks_vend.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"Senator",
"Consul",
"Cap-Slut",
"Condom"
"Condom",
"Catpain"
)
LAZYADD(alt_titles, extra_titles)
. = ..()
Expand Down
26 changes: 26 additions & 0 deletions modular_splurt/code/modules/language/language.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
//

3 changes: 2 additions & 1 deletion modular_splurt/code/modules/vending/snack.dm
Original file line number Diff line number Diff line change
@@ -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)
. = ..()
Binary file modified modular_splurt/icons/misc/language.dmi
Binary file not shown.
Binary file modified modular_splurt/icons/obj/food/food.dmi
Binary file not shown.
Binary file modified modular_splurt/icons/obj/janitor.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit e2cd966

Please sign in to comment.