diff --git a/code/game/antagonist/antagonist_objectives.dm b/code/game/antagonist/antagonist_objectives.dm index 96591eae1ed..c4b984d120b 100644 --- a/code/game/antagonist/antagonist_objectives.dm +++ b/code/game/antagonist/antagonist_objectives.dm @@ -33,7 +33,6 @@ /mob/living/proc/write_ambition() set name = "Set Ambition" set category = "IC" - set src = usr if(!mind) return diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 2ae8225a4c5..84d7aa28d0f 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -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 diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index c0be16babed..742021315fe 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -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.")) diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index 02f46dbeceb..764433421dd 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -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. diff --git a/html/changelogs/mattatlas-i_hate_the_way_it_pulls_me_under.yml b/html/changelogs/mattatlas-i_hate_the_way_it_pulls_me_under.yml new file mode 100644 index 00000000000..df1052effcf --- /dev/null +++ b/html/changelogs/mattatlas-i_hate_the_way_it_pulls_me_under.yml @@ -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." diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss index f865fe0c1d0..a6e99c3635d 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss @@ -405,7 +405,7 @@ em { color: #9269c7; } .radio { - color: #008000; + color: #00a700; } .deptradio { color: #ff00ff; diff --git a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss index 0c5d812a8cb..1cd8c1c8f08 100644 --- a/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss +++ b/tgui/packages/tgui-panel/styles/tgchat/chat-light.scss @@ -410,7 +410,7 @@ em { color: #530fad; } .radio { - color: #008000; + color: #00a700; } .deptradio { color: #ff00ff;