Skip to content

Commit

Permalink
SSD Tweaks (Aurorastation#15172)
Browse files Browse the repository at this point in the history
  • Loading branch information
alsoandanswer authored Nov 29, 2022
1 parent 7172b0b commit 0bbca43
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 2 deletions.
1 change: 1 addition & 0 deletions code/modules/mob/abstract/observer/observer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ Works together with spawning an observer, noted above.

/mob/proc/ghostize(var/can_reenter_corpse = TRUE, var/should_set_timer = TRUE)
if(ckey)
cut_overlay(image('icons/effects/effects.dmi', "zzz_glow")) // not very efficient but ghostize isn't called /too/ often.
var/mob/abstract/observer/ghost = new(src) //Transfer safety to observer spawning proc.
ghost.can_reenter_corpse = can_reenter_corpse
ghost.timeofdeath = src.stat == DEAD ? src.timeofdeath : world.time
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/human/life.dm
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,7 @@
return 0

//SSD check, if a logged player is awake put them back to sleep!
if(species.show_ssd && (!client && !vr_mob) && !teleop)
if(species.show_ssd && (!client && !vr_mob) && !teleop && ((world.realtime - disconnect_time) >= 5 MINUTES)) //only sleep after 5 minutes, should help those with intermittent internet connections
Sleeping(2)
if(stat == DEAD) //DEAD. BROWN BREAD. SWIMMING WITH THE SPESS CARP
blinded = 1
Expand Down
4 changes: 3 additions & 1 deletion code/modules/mob/living/carbon/human/login.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
update_hud()
if(species)
species.handle_login_special(src)
if(client)
cut_overlay(image('icons/effects/effects.dmi', "zzz_glow"))
var/datum/antagonist/antag = player_is_antag(mind, FALSE)
if(antag)
antag.handle_latelogin(src)
antag.handle_latelogin(src)
2 changes: 2 additions & 0 deletions code/modules/mob/living/carbon/human/logout.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
..()
if(species)
species.handle_logout_special(src)
if(mind && mind.active && stat != DEAD)
add_overlay(image('icons/effects/effects.dmi', icon_state = "zzz_glow"))
41 changes: 41 additions & 0 deletions html/changelogs/wezzy_SSDtweaks.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################

# Your name.
author: Wowzewow (Wezzy)

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "SSD no longer immediately puts you to sleep - only after 5 minutes will your character drop on the ground. Also, adds an overlay to indicate when someone's SSD."
Binary file modified icons/effects/effects.dmi
Binary file not shown.

0 comments on commit 0bbca43

Please sign in to comment.