Skip to content

Commit

Permalink
Merge pull request #32 from Lhars/Minor-Fixes-1
Browse files Browse the repository at this point in the history
Minor Fixes - Stairs edition
  • Loading branch information
TheGreatKitsune authored Oct 16, 2024
2 parents 36391fc + 5d47d25 commit e98776f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion code/controllers/subsystem/rogue/treasury.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
for(var/mob/living/carbon/human/X in GLOB.human_list)
if(X.real_name in names_to)
if(!X.stat)
to_chat(X, span_info("[msg]"))
to_chat(X, span_biginfo("[msg]"))

SUBSYSTEM_DEF(treasury)
name = "treasury"
Expand Down
7 changes: 1 addition & 6 deletions code/game/objects/structures/stairs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@
..()
if(GLOB.lordprimary)
lordcolor(GLOB.lordprimary,GLOB.lordsecondary)
else
GLOB.lordcolor += src
GLOB.lordcolor += src

/obj/structure/stairs/fancy/Destroy()
GLOB.lordcolor -= src
Expand All @@ -52,8 +51,6 @@
var/mutable_appearance/M = mutable_appearance(icon, "[icon_state]_primary", -(layer+0.1))
M.color = primary
add_overlay(M)
GLOB.lordcolor -= src


/obj/structure/stairs/OnCrafted(dirin)
. = ..()
Expand Down Expand Up @@ -148,6 +145,4 @@
pulling.forceMove(newtarg)
L.start_pulling(pulling, supress_message = TRUE)
if(was_pulled_buckled) // Assume this was a fireman carry since piggybacking is not a thing
var/mob/living/pulled_mob = pulling
pulled_mob.grippedby(L, TRUE)
L.buckle_mob(pulling, TRUE, TRUE, 90, 0, 0)
2 changes: 1 addition & 1 deletion code/modules/roguetown/roguemachine/mail.dm
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
else
visible_message(span_warning("[user] sends something."))
playsound(loc, 'sound/misc/disposalflush.ogg', 100, FALSE, -1)
send_ooc_note(span_boldwarning("New letter from <b>[sentfrom].</b>"), name = send2place)
send_ooc_note("New letter from <b>[sentfrom].</b>", name = send2place)
return
if(istype(P, /obj/item/roguecoin))
if(coin_loaded)
Expand Down

0 comments on commit e98776f

Please sign in to comment.