diff --git a/code/datums/uplink/uplink_categories.dm b/code/datums/uplink/uplink_categories.dm index b348a7e2ab2..6e8e1d6e49e 100644 --- a/code/datums/uplink/uplink_categories.dm +++ b/code/datums/uplink/uplink_categories.dm @@ -86,11 +86,10 @@ /datum/uplink_category/gear_loadout name = "Gear Loadout" - antag_roles = list(MODE_MERCENARY) /datum/uplink_category/revolution name = "Revolution Items" antag_roles = list(MODE_REVOLUTIONARY) /datum/uplink_category/martial_arts - name = "Martial Arts" \ No newline at end of file + name = "Martial Arts" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 75327b77c92..0e6fe54a474 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -198,7 +198,7 @@ desc = "A formal black suit and red tie, intended for the station's finest." icon_state = "really_black_suit" item_state = "jensensuit" - worn_state = "black_suit" + worn_state = "really_black_suit" /obj/item/clothing/under/suit_jacket/red name = "red suit" diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index 75092602061..499968c1dc9 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -591,7 +591,6 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I unacidable = TRUE amount_per_transfer_from_this = 10 volume = 120 - center_of_mass = list("x"=17, "y"=7) /obj/item/reagent_containers/food/drinks/pitcher name = "pitcher" diff --git a/html/changelogs/KingOfThePing - oh_my_kidneys.yml b/html/changelogs/KingOfThePing - oh_my_kidneys.yml new file mode 100644 index 00000000000..120878edd83 --- /dev/null +++ b/html/changelogs/KingOfThePing - oh_my_kidneys.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: KingOfThePing + +# 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: "Fixes the Vaurca kidney icon_state missing." + - bugfix: "Fixes the black and executive suit to actually have their respective sprite." + - bugfix: "Removed the weird off-center from the teapot." + - bugfix: "Made the Gear Selection in the Uplink return, in a lazy way." diff --git a/icons/obj/organs/vaurca_organs.dmi b/icons/obj/organs/vaurca_organs.dmi index 94405113c49..1b7f4e38669 100644 Binary files a/icons/obj/organs/vaurca_organs.dmi and b/icons/obj/organs/vaurca_organs.dmi differ