cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 11:07:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Various Tweaks & Fixes (#15857)

Browse Source 
* Stuff

* Grammar reviewer review

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>

* Shuttle call HTML fix

And multiline announcements too, à la #15645.

The clean_input() was causing the message to be encoded twice, and only decoded once. Removing it still encodes the string.

* Loadout revert

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
This commit is contained in:
SabreML
2021-05-24 16:29:07 +01:00
committed by GitHub
co-authored by Sean Williams
parent 311c0b5317
commit 4960f5440c
16 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/glasses/glasses.dm
+2 -2
View File
@@ -424,9 +424,9 @@
..()
/obj/item/clothing/glasses/thermal/monocle
name = "thermoncle"
name = "thermonocle"
desc = "A thermal monocle."
icon_state = "thermoncle"
icon_state = "thermonocle"
flags_cover = null //doesn't protect eyes because it's a monocle, duh
/obj/item/clothing/glasses/thermal/eyepatch
code/modules/karma/karma.dm
+3 -1
View File
@@ -127,11 +127,13 @@ GLOBAL_LIST_EMPTY(karma_spenders)
continue
if(M == src)
continue
if(M.get_preference(PREFTOGGLE_DISABLE_KARMA))
continue
if(!isobserver(src) && isNonCrewAntag(M))
continue // Don't include special roles for non-observers, because players use it to meta
karma_list += M
if(!karma_list.len)
if(!length(karma_list))
to_chat(usr, "<span class='warning'>There's no-one to spend your karma on.</span>")
return
code/modules/mob/living/death.dm
+1 -1
View File
@@ -93,7 +93,7 @@
for(var/P in GLOB.dead_mob_list)
var/mob/M = P
if((M.client?.prefs.toggles2 & PREFTOGGLE_2_DEATHMESSAGE) && (isobserver(M) || M.stat == DEAD))
to_chat(M, "<span class='deadsay'><b>[mind.name]</b> has died at <b>[area_name]</b>. (<a href='?src=[M.UID()];jump=\ref[src]'>JMP</a>)</span>")
to_chat(M, "<span class='deadsay'><b>[mind.name]</b> has died at <b>[area_name]</b>. (<a href='?src=[M.UID()];jump=\ref[T]'>JMP</a>)</span>")
if(SSticker && SSticker.mode)
SSticker.mode.check_win()
code/modules/mob/living/silicon/ai/ai.dm
+1 -1
View File
@@ -539,7 +539,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
if(check_unable(AI_CHECK_WIRELESS))
return
var/input = clean_input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","")
var/input = input("Please enter the reason for calling the shuttle.", "Shuttle Call Reason.") as null|message
if(!input || stat)
return
code/modules/projectiles/guns/medbeam.dm
+1 -1
View File
@@ -92,7 +92,7 @@
return 0
for(var/obj/effect/ebeam/medical/B in turf)// Don't cross the str-beams!
if(B.owner != current_beam)
turf.visible_message("<span class='boldwarning'>The medbeams cross and EXPLODE!</span>")
turf.visible_message("<span class='userdanger'>The medbeams cross and EXPLODE!</span>")
explosion(B.loc,0,3,5,8)
qdel(dummy)
return 0