Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes more sus content #231

Merged
merged 11 commits into from
Feb 9, 2025
Merged

Removes more sus content #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
194caf5
Update TGS DMAPI
novasector-ci[bot] Jan 30, 2025
5431b5c
Merge pull request #1 from TyrantCerberus/tgs-dmapi-update
TyrantCerberus Jan 30, 2025
57cda84
Merge branch 'IrisSS13:master' into master
TyrantCerberus Jan 30, 2025
828bdb8
Merge branch 'IrisSS13:master' into master
TyrantCerberus Feb 1, 2025
21b86a5
Merge branch 'IrisSS13:master' into master
TyrantCerberus Feb 7, 2025
c023341
WIP.
TyrantCerberus Feb 7, 2025
5d0b9af
Iris ion laws file.
TyrantCerberus Feb 7, 2025
61919a5
Slightly sanitises ion laws.
TyrantCerberus Feb 7, 2025
e8c60d8
Missing comment fix.
TyrantCerberus Feb 7, 2025
2f53548
Almost forgot.
TyrantCerberus Feb 7, 2025
cecced4
Runtime fix.
TyrantCerberus Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion code/__DEFINES/text.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@
/// File location for brain damage traumas
#define BRAIN_DAMAGE_FILE "traumas.json"
/// File location for AI ion laws
#define ION_FILE "ion_laws.json"
//IRIS EDIT CHANGE BEGIN - SUSSY_CONTENT_REMOVAL
#define ION_FILE "iris/ion_laws_iris.json"
//IRIS EDIT CHANGE END
/// File location for pirate names
#define PIRATE_NAMES_FILE "pirates.json"
/// File location for redpill questions
Expand Down
4 changes: 4 additions & 0 deletions code/datums/memory/_memory.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,11 @@
/mob/living/basic/stickman,
/mob/living/basic/stickman/dog,
/mob/living/simple_animal/hostile/megafauna/dragon/lesser,
//IRIS EDIT REMOVAL BEGIN - SUSSY_CONTENT_REMOVAL
/*
/obj/item/food/sausage/american,
*/
//IRIS EDIT REMOVAL END
/obj/item/skub,
)

Expand Down
12 changes: 10 additions & 2 deletions code/game/objects/items/food/meatdish.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,9 @@
)
tastes = list("meat" = 1)
foodtypes = MEAT | RAW
eatverbs = list("bite", "chew", "nibble", "deep throat", "gobble", "chomp")
//IRIS EDIT CHANGE BEGIN - SUSSY_CONTENT_REMOVAL
eatverbs = list("bite", "chew", "nibble", "gobble", "chomp")
//IRIS EDIT CHANGE END
w_class = WEIGHT_CLASS_SMALL
crafting_complexity = FOOD_COMPLEXITY_1

Expand All @@ -613,14 +615,18 @@
tastes = list("meat" = 1)
foodtypes = MEAT | BREAKFAST
food_flags = FOOD_FINGER_FOOD
eatverbs = list("bite", "chew", "nibble", "deep throat", "gobble", "chomp")
//IRIS EDIT CHANGE BEGIN - SUSSY_CONTENT_REMOVAL
eatverbs = list("bite", "chew", "nibble", "gobble", "chomp")
//IRIS EDIT CHANGE END
w_class = WEIGHT_CLASS_SMALL
venue_value = FOOD_PRICE_CHEAP
crafting_complexity = FOOD_COMPLEXITY_2
custom_price = PAYCHECK_CREW * 0.6

/obj/item/food/sausage/make_processable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/salami, 6, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")
//IRIS EDIT REMOVAL BEGIN - SUSSY_CONTENT_REMOVAL
/*
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/sausage/american, 1, 3 SECONDS, table_required = TRUE, screentip_verb = "Slice")

/obj/item/food/sausage/american
Expand All @@ -630,6 +636,8 @@

/obj/item/food/sausage/american/make_processable()
return
*/
//IRIS EDIT REMOVAL END

/obj/item/food/salami
name = "salami"
Expand Down
4 changes: 3 additions & 1 deletion code/modules/food_and_drinks/recipes/soup_mixtures.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2231,7 +2231,9 @@
required_ingredients = list(
/obj/item/food/canned/beans = 1,
/obj/item/food/spaghetti/rawnoodles = 1,
/obj/item/food/sausage/american = 1,
//IRIS EDIT CHANGE BEGIN - SUSSY_CONTENT_REMOVAL
/obj/item/food/sausage = 1,
//IRIS EDIT CHANGE END
/obj/item/food/chapslice = 2,
/obj/item/food/kimchi = 1,
/obj/item/food/cheese/wedge = 1,
Expand Down
4 changes: 4 additions & 0 deletions code/modules/food_and_drinks/recipes/tablecraft/recipes_guide.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,10 +321,14 @@
result = /obj/item/food/salami
category = CAT_MEAT

//IRIS EDIT REMOVAL BEGIN - SUSSY_CONTENT_REMOVAL
/*
/datum/crafting_recipe/food/knife/american_sausage
reqs = list(/obj/item/food/sausage = 1)
result = /obj/item/food/sausage/american
category = CAT_MEAT
*/
//IRIS EDIT REMOVAL END

/datum/crafting_recipe/food/knife/tempehslice
reqs = list(/obj/item/food/tempeh = 1)
Expand Down
4 changes: 3 additions & 1 deletion code/modules/food_and_drinks/recipes/tablecraft/recipes_martian.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,9 @@
reqs = list(
/obj/item/food/boiledrice = 1,
/obj/item/food/onion_slice = 1,
/obj/item/food/sausage/american = 1,
//IRIS EDIT CHANGE BEGIN - SUSSY_CONTENT_REMOVAL
/obj/item/food/sausage = 1,
//IRIS EDIT CHANGE END
/obj/item/food/grown/carrot = 1,
/obj/item/food/grown/peas = 1,
/datum/reagent/consumable/ketchup = 5,
Expand Down
2 changes: 0 additions & 2 deletions code/modules/tgs/core/datum.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ TGS_DEFINE_AND_SET_GLOBAL(tgs, null)
src.event_handler = event_handler
src.version = version

// chumbis

/datum/tgs_api/proc/TerminateWorld()
while(TRUE)
TGS_DEBUG_LOG("About to terminate world. Tick: [world.time], sleep_offline: [world.sleep_offline]")
Expand Down
2 changes: 1 addition & 1 deletion code/modules/tgs/v3210/api.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
if(SERVICE_CMD_LIST_CUSTOM)
return json_encode(ListServiceCustomCommands(FALSE))
else
var/custom_command_result = HandleServiceCustomCommand(LOWER_TEXT(command), params[SERVICE_CMD_PARAM_SENDER], params[SERVICE_CMD_PARAM_CUSTOM])
var/custom_command_result = HandleServiceCustomCommand(lowertext(command), params[SERVICE_CMD_PARAM_SENDER], params[SERVICE_CMD_PARAM_CUSTOM])
if(custom_command_result)
return istext(custom_command_result) ? custom_command_result : SERVICE_RETURN_SUCCESS
return "Unknown command: [command]"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/tgs/v3210/commands.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
cached_custom_tgs_chat_commands = list()
for(var/I in typesof(/datum/tgs_chat_command) - /datum/tgs_chat_command)
var/datum/tgs_chat_command/stc = I
cached_custom_tgs_chat_commands[LOWER_TEXT(initial(stc.name))] = stc
cached_custom_tgs_chat_commands[lowertext(initial(stc.name))] = stc

var/command_type = cached_custom_tgs_chat_commands[command]
if(!command_type)
Expand Down
Loading
Loading