diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 7fad1690e6..41068048a1 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -274,7 +274,7 @@ GLOBAL_LIST_INIT(redacted_strings, list("\[REDACTED\]", "\[CLASSIFIED\]", "\[ARC GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt")) //LANGUAGE CHARACTER CUSTOMIZATION -GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps", "clicks", "hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles")) +GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps", "clicks", "hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles", "caws", "gekkers", "clucks")) GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc, "xeno tongue" = /obj/item/organ/tongue/alien)) //SPECIES BODYPART LISTS diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index c1579dfe15..301b8d4155 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -63,7 +63,7 @@ name = "advanced fire extinguisher" desc = "Used to stop thermonuclear fires from spreading inside your engine." icon_state = "foam_extinguisher0" - //item_state = "foam_extinguisher" needs sprite + item_state = "foam_extinguisher" dog_fashion = null chem = /datum/reagent/firefighting_foam tanktype = /obj/structure/reagent_dispensers/foamtank diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index ba66bf6e26..7f28b88ad6 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -166,15 +166,10 @@ icon_state = "sweater_uglyxmas" item_state = "sweater_uglyxmas" -/obj/item/clothing/accessory/sweater/uglyxmas - name = "ugly xmas sweater" - icon_state = "sweater_uglyxmas" - item_state = "sweater_uglyxmas" - /obj/item/clothing/accessory/sweater/flower name = "flower sweater" - icon_state = "sweater_uglyxmas" - item_state = "sweater_uglyxmas" + icon_state = "sweater_flower" + item_state = "sweater_flower" //////////////// //Suit Jackets// @@ -223,6 +218,11 @@ icon_state = "turtleneck_red" item_state = "turtleneck_red" +/obj/item/clothing/accessory/turtleneck/comfy + name = "comfy turtleneck" + icon_state = "turtleneck_comfy" + item_state = "turtleneck_comfy" + /obj/item/clothing/accessory/turtleneck/tactifool name = "black sweaterneck" desc = "Extra fool. Extra cool." diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm index 4b23112e5e..0c22a85886 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm @@ -73,6 +73,14 @@ name = "Beehive 2" icon_state = "hair_beehive2" +/datum/sprite_accessory/hair/belenko + name = "Beleneko" + icon_state = "hair_belenko" + +/datum/sprite_accessory/hair/belenkotied + name = "Belenko (Tied)" + icon_state = "hair_belenkotied" + /datum/sprite_accessory/hair/belle name = "Belle" icon_state = "hair_belle" @@ -325,6 +333,10 @@ name = "Flow Hair" icon_state = "hair_f" +/datum/sprite_accessory/hair/fluffy + name = "Fluffy" + icon_state = "hair_fluffy" + /datum/sprite_accessory/hair/fringetail name = "Fringe Tail" icon_state = "hair_fringetail" @@ -607,6 +619,10 @@ name = "Ponytail (Side) 4" icon_state = "hair_sidetail4" +/datum/sprite_accessory/hair/sharptail + name = "Ponytail (Sharp)" + icon_state = "hair_sharptail" + /datum/sprite_accessory/hair/spikytail name = "Ponytail (Spiky)" icon_state = "hair_spikyponytail" @@ -711,6 +727,26 @@ name = "Skinhead" icon_state = "hair_skinhead" +/datum/sprite_accessory/hair/simple + name = "Simple" + icon_state = "hair_simple" + +/datum/sprite_accessory/hair/skrellvshort + name = "Skrell Replicant (Very Short)" + icon_state = "hair_skrellvshort" + +/datum/sprite_accessory/hair/skrellshort + name = "Skrell Replicant (Short)" + icon_state = "hair_skrellshort" + +/datum/sprite_accessory/hair/skrell + name = "Skrell Replicant (Average)" + icon_state = "hair_skrell" + +/datum/sprite_accessory/hair/skrelllong + name = "Skrell Replicant (Long)" + icon_state = "hair_skrelllong" + /datum/sprite_accessory/hair/sleaze name = "Sleaze" icon_state = "hair_sleaze" diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 4c69f6bb27..8d19d46530 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -34,7 +34,6 @@ /obj/item/clothing/under/costume/kilt = 3, /obj/item/clothing/under/misc/overalls = 3, /obj/item/clothing/under/suit/sl = 3, - /obj/item/clothing/under/sweater = 3, /obj/item/clothing/accessory/sweater = 3, /obj/item/clothing/accessory/sweater/pink = 3, /obj/item/clothing/accessory/sweater/heart = 3, @@ -45,9 +44,11 @@ /obj/item/clothing/accessory/sweater/flower = 3, /obj/item/clothing/accessory/turtleneck = 2, /obj/item/clothing/accessory/turtleneck/red = 2, + /obj/item/clothing/accessory/turtleneck/comfy = 2, /obj/item/clothing/accessory/turtleneck/tactifool = 2, /obj/item/clothing/accessory/turtleneck/tactifool/green = 2, /obj/item/clothing/accessory/turtleneck/tactifool/blue = 2, + /obj/item/clothing/under/sweater = 3, /obj/item/clothing/under/sweater/black = 3, /obj/item/clothing/under/sweater/purple = 3, /obj/item/clothing/under/sweater/green = 3, diff --git a/html/changelogs/AutoChangeLog-pr-14148.yml b/html/changelogs/AutoChangeLog-pr-14148.yml new file mode 100644 index 0000000000..e25a6357cd --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14148.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - imageadd: "uncodersprites the advanced extinguisher" diff --git a/html/changelogs/AutoChangeLog-pr-14149.yml b/html/changelogs/AutoChangeLog-pr-14149.yml new file mode 100644 index 0000000000..640c387c63 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14149.yml @@ -0,0 +1,4 @@ +author: "timothyteakettle" +delete-after: True +changes: + - rscadd: "adds 'clucks', 'caws' and 'gekkers' to the speech verb list" diff --git a/html/changelogs/AutoChangeLog-pr-14156.yml b/html/changelogs/AutoChangeLog-pr-14156.yml new file mode 100644 index 0000000000..e43aa2f83e --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-14156.yml @@ -0,0 +1,4 @@ +author: "zeroisthebiggay" +delete-after: True +changes: + - rscadd: "some more FUCKING hairs" diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi index 96308a6e70..3d1f58743c 100644 Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ diff --git a/icons/mob/hair.dmi b/icons/mob/hair.dmi index 278c5de311..6ecaad55a5 100644 Binary files a/icons/mob/hair.dmi and b/icons/mob/hair.dmi differ diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 0a82845910..6f747f1265 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index abfbb18f84..af14ba7784 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi index 6d62053062..e832bf64d3 100644 Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm index fd03e2279f..d1c2c69b99 100644 --- a/modular_citadel/code/modules/client/loadout/head.dm +++ b/modular_citadel/code/modules/client/loadout/head.dm @@ -15,6 +15,18 @@ name = "Black beret" path = /obj/item/clothing/head/beret/black +/datum/gear/head/redberet + name = "Red beret" + path = /obj/item/clothing/head/beret + +/datum/gear/head/purpleberet + name = "Purple beret" + path = /obj/item/clothing/head/beret/purple + +/datum/gear/head/blueberet + name = "Blue beret" + path = /obj/item/clothing/head/beret/blue + /datum/gear/head/flatcap name = "Flat cap" path = /obj/item/clothing/head/flatcap