Skip to content

Commit

Permalink
Defib, toggle hair coverage, common radio fixes (#16594)
Browse files Browse the repository at this point in the history
* 1x1

* ting

---------

Co-authored-by: Matt Atlas <[email protected]>
  • Loading branch information
NonQueueingMatt and Matt Atlas authored Jun 29, 2023
1 parent 715067d commit 8066870
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 3 deletions.
1 change: 0 additions & 1 deletion code/game/antagonist/antagonist_objectives.dm
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
/mob/living/proc/write_ambition()
set name = "Set Ambition"
set category = "IC"
set src = usr

if(!mind)
return
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -559,6 +559,7 @@
/obj/item/clothing/head/proc/toggle_block_hair()
set name = "Toggle Hair Coverage"
set category = "Object"
set src in usr

if(allow_hair_covering)
flags_inv ^= BLOCKHEADHAIR
Expand Down
1 change: 1 addition & 0 deletions code/modules/mob/holder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ var/list/holder_mob_icon_cache = list()
/obj/item/holder/carp/baby/verb/toggle_block_hair()
set name = "Toggle Hair Coverage"
set category = "Object"
set src in usr

flags_inv ^= BLOCKHEADHAIR
to_chat(usr, SPAN_NOTICE("\The [src] will now [flags_inv & BLOCKHEADHAIR ? "hide" : "show"] hair."))
Expand Down
1 change: 1 addition & 0 deletions code/modules/surgery/surgery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@
/obj/item/spell/mend_organs,
/obj/item/spell/modifier/mend_life,
/obj/item/spell/modifier/mend_synthetic,
/obj/item/defibrillator,
/obj/item/grab
)
// Check for multi-surgery drifting.
Expand Down
44 changes: 44 additions & 0 deletions html/changelogs/mattatlas-i_hate_the_way_it_pulls_me_under.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
################################
# 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: MattAtlas

# 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:
- bugfix: "Common radio is a lighter colour once again."
- bugfix: "Fixed the toggle hair coverage verb."
- bugfix: "Fixed using defibs on surgery surfaces."
- bugfix: "Fixed the set ambition verb."
2 changes: 1 addition & 1 deletion tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ em {
color: #9269c7;
}
.radio {
color: #008000;
color: #00a700;
}
.deptradio {
color: #ff00ff;
Expand Down
2 changes: 1 addition & 1 deletion tgui/packages/tgui-panel/styles/tgchat/chat-light.scss
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ em {
color: #530fad;
}
.radio {
color: #008000;
color: #00a700;
}
.deptradio {
color: #ff00ff;
Expand Down

0 comments on commit 8066870

Please sign in to comment.