Skip to content

Commit

Permalink
Merge branch 'master' into atmos-update
Browse files Browse the repository at this point in the history
  • Loading branch information
MosleyTheMalO committed Nov 30, 2024
2 parents 624d5f5 + 3c63bdc commit 66e3937
Show file tree
Hide file tree
Showing 14 changed files with 133 additions and 71 deletions.
129 changes: 68 additions & 61 deletions code/datums/elements/cleaning.dm
Original file line number Diff line number Diff line change
@@ -1,66 +1,73 @@
/datum/element/cleaning/Attach(datum/target)
/datum/element/cleaning
element_flags = ELEMENT_BESPOKE|ELEMENT_DETACH
id_arg_index = 2
/// Range of cleaning on moving
var/range = 0

/datum/element/cleaning/Attach(atom/movable/cleaner, cleaning_range)
. = ..()
if(!ismovable(target))
if(!istype(cleaner))
return ELEMENT_INCOMPATIBLE
RegisterSignal(target, COMSIG_MOVABLE_MOVED, PROC_REF(Clean))
if(cleaning_range)
range = cleaning_range
RegisterSignal(cleaner, COMSIG_MOVABLE_MOVED, PROC_REF(Clean))

/datum/element/cleaning/Detach(datum/target)
/datum/element/cleaning/Detach(atom/movable/cleaner)
. = ..()
UnregisterSignal(target, COMSIG_MOVABLE_MOVED)
UnregisterSignal(cleaner, COMSIG_MOVABLE_MOVED)

/datum/element/cleaning/proc/Clean(datum/source)
var/atom/movable/AM = source
var/turf/T = AM.loc
SEND_SIGNAL(T, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
for(var/A in T)
if(is_cleanable(A))
qdel(A)
else if(isitem(A))
var/obj/item/cleaned_item = A
SEND_SIGNAL(cleaned_item, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_item.clean_blood()
if(ismob(cleaned_item.loc))
var/mob/M = cleaned_item.loc
M.regenerate_icons()
else if(ishuman(A))
var/mob/living/carbon/human/cleaned_human = A
if(cleaned_human.lying)
if(cleaned_human.head)
SEND_SIGNAL(cleaned_human.head, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.head.clean_blood()
cleaned_human.update_inv_head()
if(cleaned_human.wear_suit)
SEND_SIGNAL(cleaned_human.wear_suit, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.wear_suit.clean_blood()
cleaned_human.update_inv_wear_suit()
else if(cleaned_human.w_uniform)
SEND_SIGNAL(cleaned_human.w_uniform, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.w_uniform.clean_blood()
cleaned_human.update_inv_w_uniform()
//skyrat edit
else if(cleaned_human.w_underwear)
SEND_SIGNAL(cleaned_human.w_underwear, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.w_underwear.clean_blood()
cleaned_human.update_inv_w_underwear()
else if(cleaned_human.w_socks)
SEND_SIGNAL(cleaned_human.w_socks, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.w_socks.clean_blood()
cleaned_human.update_inv_w_socks()
else if(cleaned_human.w_shirt)
SEND_SIGNAL(cleaned_human.w_shirt, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.w_shirt.clean_blood()
cleaned_human.update_inv_w_shirt()
else if(cleaned_human.wrists)
SEND_SIGNAL(cleaned_human.wrists, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.w_shirt.clean_blood()
cleaned_human.update_inv_wrists()
//
if(cleaned_human.shoes)
SEND_SIGNAL(cleaned_human.shoes, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.shoes.clean_blood()
cleaned_human.update_inv_shoes()
SEND_SIGNAL(cleaned_human, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.clean_blood()
cleaned_human.wash_cream()
cleaned_human.regenerate_icons()
to_chat(cleaned_human, "<span class='danger'>[AM] cleans your face!</span>")
/datum/element/cleaning/proc/Clean(atom/movable/cleaner)
for (var/turf/turf in RANGE_TURFS(range, cleaner.loc))
SEND_SIGNAL(turf, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
for(var/atom/atom as anything in turf)
if(is_cleanable(atom))
qdel(atom)
else if(isitem(atom))
var/obj/item/cleaned_item = atom
SEND_SIGNAL(cleaned_item, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_item.clean_blood()
if(ismob(cleaned_item.loc))
var/mob/mob = cleaned_item.loc
mob.regenerate_icons()
else if(ishuman(atom))
var/mob/living/carbon/human/cleaned_human = atom
if(cleaned_human.lying)
if(cleaned_human.head)
SEND_SIGNAL(cleaned_human.head, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.head.clean_blood()
cleaned_human.update_inv_head()
if(cleaned_human.wear_suit)
SEND_SIGNAL(cleaned_human.wear_suit, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.wear_suit.clean_blood()
cleaned_human.update_inv_wear_suit()
else if(cleaned_human.w_uniform)
SEND_SIGNAL(cleaned_human.w_uniform, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.w_uniform.clean_blood()
cleaned_human.update_inv_w_uniform()
//skyrat edit
else if(cleaned_human.w_underwear)
SEND_SIGNAL(cleaned_human.w_underwear, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.w_underwear.clean_blood()
cleaned_human.update_inv_w_underwear()
else if(cleaned_human.w_socks)
SEND_SIGNAL(cleaned_human.w_socks, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.w_socks.clean_blood()
cleaned_human.update_inv_w_socks()
else if(cleaned_human.w_shirt)
SEND_SIGNAL(cleaned_human.w_shirt, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.w_shirt.clean_blood()
cleaned_human.update_inv_w_shirt()
else if(cleaned_human.wrists)
SEND_SIGNAL(cleaned_human.wrists, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.w_shirt.clean_blood()
cleaned_human.update_inv_wrists()
//
if(cleaned_human.shoes)
SEND_SIGNAL(cleaned_human.shoes, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.shoes.clean_blood()
cleaned_human.update_inv_shoes()
SEND_SIGNAL(cleaned_human, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
cleaned_human.clean_blood()
cleaned_human.wash_cream()
cleaned_human.regenerate_icons()
to_chat(cleaned_human, span_danger("[cleaner] cleans your face!"))
7 changes: 7 additions & 0 deletions code/game/objects/items/cigs_lighters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
. += lighter_overlay

/obj/item/lighter/ignition_effect(atom/A, mob/user)
playsound(src, 'modular_sand/sound/items/lighter/light.ogg', 50, 0)
if(get_temperature())
. = "<span class='rose'>With a single flick of [user.p_their()] wrist, [user] smoothly lights [A] with [src]. Damn [user.p_theyre()] cool.</span>"

Expand All @@ -583,6 +584,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
/obj/item/lighter/attack_self(mob/living/user)
if(user.is_holding(src))
if(!lit)
// SANDSTORM EDIT
playsound(src, 'modular_sand/sound/items/lighter/open.ogg', 50, 0)
// End of edit
set_lit(TRUE)
if(fancy)
user.visible_message("Without even breaking stride, [user] flips open and lights [src] in one smooth movement.", "<span class='notice'>Without even breaking stride, you flip open and light [src] in one smooth movement.</span>")
Expand All @@ -606,6 +610,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "burnt_thumb", /datum/mood_event/burnt_thumb)

else
// SANDSTORM EDIT
playsound(src, 'modular_sand/sound/items/lighter/close.ogg', 50, 0)
// Edit end
set_lit(FALSE)
if(fancy)
user.visible_message("You hear a quiet click, as [user] shuts off [src] without even looking at what [user.p_theyre()] doing. Wow.", "<span class='notice'>You quietly shut off [src] without even looking at what you're doing. Wow.</span>")
Expand Down
10 changes: 9 additions & 1 deletion code/modules/mob/living/carbon/human/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1650,7 +1650,15 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
H.Jitter(5)
hunger_rate = 3 * HUNGER_FACTOR
hunger_rate *= H.physiology.hunger_mod
H.adjust_nutrition(-hunger_rate)

// SANDSTORM EDIT
if (H.client)
H.adjust_nutrition(-hunger_rate)
else
// Do not allow SSD players to get too hungry.
if (H.nutrition >= NUTRITION_LEVEL_FED)
H.adjust_nutrition(-hunger_rate)
// End of sandstorm edit


if (H.nutrition > NUTRITION_LEVEL_FULL)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/silicon/robot/robot.dm
Original file line number Diff line number Diff line change
Expand Up @@ -926,7 +926,7 @@
status_flags &= ~CANPUSH

if(module.clean_on_move)
AddElement(/datum/element/cleaning)
AddElement(/datum/element/cleaning, cleaning_range = 1)
else
RemoveElement(/datum/element/cleaning)

Expand Down Expand Up @@ -1196,8 +1196,8 @@
var/mob/unbuckle_me_now = i
unbuckle_mob(unbuckle_me_now, FALSE)

/mob/living/silicon/robot/proc/TryConnectToAI()
set_connected_ai(select_active_ai_with_fewest_borgs(z))
/mob/living/silicon/robot/proc/TryConnectToAI(mob/living/silicon/ai/connect_to)
set_connected_ai(connect_to || select_active_ai_with_fewest_borgs(z))
if(connected_ai)
lawsync()
lawupdate = TRUE
Expand Down
6 changes: 3 additions & 3 deletions config/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ $include entries/urls.txt
$include entries/vote.txt

$include plushies/defines.txt
# Special Sandstorm configs
$include sandstorm/config.txt
$include sandstorm/balance.txt

# Sandstorm configs
$include sandstorm/includes.txt

# Special SPLURT configs
$include splurt/fetish_content.txt
Expand Down
4 changes: 4 additions & 0 deletions config/sandstorm/includes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# This file is mostly so main config file relays to here, and this one relays to the rest
$include sandstorm/balance.txt
$include sandstorm/config.txt
$include sandstorm/qol.txt
7 changes: 7 additions & 0 deletions config/sandstorm/qol.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
###
## AI
###

## How many shells would an AI gain at roundstart
## Comment to disable
ROUNDSTART_AI_SHELLS 1
6 changes: 6 additions & 0 deletions html/changelogs/archive/2024-11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,9 @@
2024-11-27:
Mosley:
- bugfix: Fixes the rest of the announcement systems from the update
2024-11-28:
xTheLifex:
- rscadd: AIs will now spawn with a AI Shell
- tweak: SSD Players will no longer decrease hunger below normal stats.
- soundadd: Added sounds to lighters
- code_imp: Cleaning element now supports a range variable.
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,6 @@
value_mode = VALUE_MODE_TYPE
splitter = " | "
lowercase_key = FALSE

/datum/config_entry/number/roundstart_ai_shells // Per AI, if you ever do get a triumvirate!
min_val = 0
19 changes: 17 additions & 2 deletions modular_sand/code/modules/jobs/job_types/ai.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
/datum/job/ai/after_spawn(mob/living/silicon/ai/AI, client/player_client, latejoin)
. = ..()
if(!istype(AI))
setup_silicon_law_prefs(AI, player_client)

if(latejoin)
return

setup_silicon_law_prefs(AI, player_client)
var/free_shells = CONFIG_GET(number/roundstart_ai_shells)
if(!free_shells)
return

var/turf/open/turf = locate() in RANGE_TURFS(1, AI)

// Why the fuck is the station AI completely blocked
var/turf/where = turf || get_turf(AI)

// Creating AI shells for the AI.
for(var/iteration in 1 to free_shells)
var/mob/living/silicon/robot/free_borg = new(where)
free_borg.shell = TRUE
free_borg.TryConnectToAI(AI)
7 changes: 6 additions & 1 deletion modular_sand/code/modules/mob/living/carbon/human/species.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,12 @@
return

//Put more things here if you plan on adding more things. I know this proc is a bit empty at the moment
H.adjust_thirst(-THIRST_FACTOR)
if (H.client)
H.adjust_thirst(-THIRST_FACTOR)
else
// Do not allow SSD players to too thirsty.
if (H.thirst >= THIRST_LEVEL_QUENCHED)
H.adjust_thirst(-THIRST_FACTOR)

/* switch(get_thirst(src))
if(THIRST_LEVEL_THIRSTY to INFINITY)
Expand Down
Binary file added modular_sand/sound/items/lighter/close.ogg
Binary file not shown.
Binary file added modular_sand/sound/items/lighter/light.ogg
Binary file not shown.
Binary file added modular_sand/sound/items/lighter/open.ogg
Binary file not shown.

0 comments on commit 66e3937

Please sign in to comment.