diff --git a/code/game/objects/items/skrell.dm b/code/game/objects/items/skrell.dm index 1c67ae55801..5194ff9f12b 100644 --- a/code/game/objects/items/skrell.dm +++ b/code/game/objects/items/skrell.dm @@ -27,11 +27,11 @@ var/mob/living/carbon/human/H = user if(isskrell(H)) H.visible_message("\The [H] holds the brassy instrument up to \his eye and peers at something unseen.", - "You see the starry edgy of srom floating on the void of space.") + "You see the starry edge of srom floating on the void of space.") if(projection_ready) new/obj/effect/temp_visual/constellation (get_turf(user)) projection_ready = FALSE - addtimer(CALLBACK(src, .proc/rearm), 3 MINUTES) + addtimer(CALLBACK(src, .proc/rearm), 30 SECONDS) /obj/item/stellascope/proc/rearm() @@ -48,7 +48,7 @@ icon = 'icons/obj/skrell_items.dmi' icon_state = "starprojection" mouse_opacity = TRUE - duration = 1200 + duration = 30 SECONDS layer = LIGHTING_LAYER + 0.1 light_power = 1 light_range = 1 diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 18e852d2bdb..ae65dff4314 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -211,18 +211,16 @@ /obj/item/clothing/under/rank/idris name = "Idris Incorporated uniform" desc = "A uniform worn by Idris Incorporated employees and contractors." - icon_state = "idris_alt" - worn_state = "idris_alt" + icon_state = "idris_service" + worn_state = "idris_service" /obj/item/clothing/under/rank/idris/service name = "Idris Incorporated service uniform" desc = "A uniform worn by Idris Incorporated service personnel." - icon_state = "idris_serv" - worn_state = "idris_serv" /obj/item/clothing/under/rank/idris/service/alt - icon_state = "idris_serv_alt" - worn_state = "idris_serv_alt" + icon_state = "idris_service_alt" + worn_state = "idris_service_alt" /obj/item/clothing/under/rank/einstein_engines name = "Einstein Engines uniform" diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index 19d40ef19bc..7d33a48c770 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -138,6 +138,7 @@ /obj/item/seeds/watermelonseed = 3, /obj/item/seeds/wheatseed = 3, /obj/item/seeds/whitebeetseed = 3, + /obj/item/seeds/wulumunushaseed = 2, /obj/item/seeds/dynseed = 2 ) diff --git a/html/changelogs/alberyk-bugfixesiguess.yml b/html/changelogs/alberyk-bugfixesiguess.yml new file mode 100644 index 00000000000..8f9f72ae467 --- /dev/null +++ b/html/changelogs/alberyk-bugfixesiguess.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed the idris uniforms being invisible when worn." diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 17f2579bb6f..2da123493e5 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ