From ee5d061ee6063e5de34132b3b8105efa443d56ea Mon Sep 17 00:00:00 2001 From: Alberyk Date: Wed, 18 Sep 2019 14:38:31 -0300 Subject: [PATCH] Bugs fixes: skrell stuff and idris uniforms (#7010) -fixes idris uniforms being invisible -fixes a typo in the skrell star projector -fixes the skrell plant missing from xenobotany storages -tweaks the starry projections to last less time --- code/game/objects/items/skrell.dm | 6 +++--- code/modules/clothing/under/jobs/civilian.dm | 10 ++++------ code/modules/hydroponics/seed_storage.dm | 1 + html/changelogs/alberyk-bugfixesiguess.yml | 6 ++++++ icons/obj/clothing/uniforms.dmi | Bin 79867 -> 79867 bytes 5 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 html/changelogs/alberyk-bugfixesiguess.yml 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 17f2579bb6fe4168597024e7e34ca358cac5e75d..2da123493e5f90739bb55320af4626f6ff3b9243 100644 GIT binary patch delta 1553 zcmV+s2JZR$?*#kr1duy_ZX7oZhR^m>EShUmG-(dK_);V&a!6i5;7HsNJsL`-q@7Hj zzK7X3c9B;97P&aUCrYA3>L+Jko&Nan=f}^d_n$uAU)ZW-Jw2S>{qpPm-6o;M)5Gbv zxA%9EWsdFmPi@rr^lMLDve~!O=K&Lu}4yA*~ZgGJ`bUlgLq0~V`~N`q>_-0 z*5qoJHr{EDs^gPV`YL1RTHeMhOSJ854!dku7`Z40BXDNrCcYwZze;U34xEcv zPI(@K)Yd$nm~|E%?>cYe%^HbLz^mXB5+*B|jMG=@GLQ2}sk@K=vdQ1??*b>4~tE8uwtiWJNC0Y|M(8H4YemI3@B6hBhYfohUg85N`Rx zMk$Rq-f}mo<9X|@K|BG9qlh8cD(e`k`63Lsk9?DJ&f{R468WVrV&L)Bn5~VyIHk@Y zIvca%><*&F0VIKwQ6LH}Pq~S&Z((w*Xh|9{^EK%^<#E#d_L4ww^}^av)7KXT#i!I6 zig4{#F>;ZA1OzUB+0my%5+cekNCK+-WyeC?8#N!13+^+G_v^{#+!(O<*NSS{(rv7S zj47qv-H`PkSt}p_=R`pWc}J_aK2=C89w??j4;IwR-}mp%Jod10aAkj_m9Q)e!?kNL zu0WE_30S9SV^d0WK9d+QeKRSA%>fen8#<5CO;)gfV!NWqRoG;8;7!_9-rXMX3A|N+vT?63uoB|G)x&ybj)ZNF{tpVZ7)?8OPXB(gV)2owh1sYOR ztJFr?&;c>mE9zDP*8Yq~RMSzLB4_L)na^l{cR}g0gUyX@bJqaUKC)jJ?wm9NdoeMW zaV)OvBdK_#0CGDiAj7WO63o?8BELNLwfv*;@b14=JfiZZ)Y(mmz9JFVwRE5iJestw z#td{xBAFs8`-ov>M7b_v%`K6Zu@pGi8nZQ27rz*R$m3@N5N&YfH!es8NLmlu)s4S@ zU_CNv^@(Z~kB_=mWGKEwTI9wxt-UtV`NmOu?mC}yT5ffL16y4`@E7K-LfYV28tF~^ z4?Oli{WVsJd37x^^kjv+LOJ)!jq~oA)bDPQHS73`gk=>);gm&v%5AJ4K!Zn97VZA? zg;jKRGt^Z((kaAlQ5xSepf;1j!C{?$j!KfUfv|Bnk{HMzS*DTBV|PDe9U?)uD2=gY zY+M_gPQ4@EVooVfCh^cGy{vOBc>^K6P6hXk_a)}1_! zxoxf^SwKnPxeq)A;DdM~_3X}n)MV~F-pPSqo6tAWK&M5_cR_xl^F+SR1!!(ZF44h1 z8i`z@YwV+n7o;o6B|78EWI&th+iPObx6v0gbOXM!&iHCx(71hc`A;u5Wcr}twZFvC zXE%_FTRHrDMtpVp@cI4e{il!je*;=|ET7M!goFS9AOJ~3K~#90?45aoF9x?S1_8`5 D2&V~X delta 1553 zcmV+s2JZR$?*#kr1duy_k`y-#hR?fCF$LF<3WP&0dr3j1IKV5o)V8LrZMSS>dz$9y zbLe4NQY8K-#bv4bEZedr|5DG()1UAE`ta%W?&F913tN?}r-#$qUw^y5+a$DjdN}?5 z=Ke0S%&{H+sf`++9!@W&)cM8zT@b6Mhtuo(yR*^C$KOv-5nYCVP&U$eY-{I~@;1b# zM1DNy7Nw1+oQ?M(WE>DftV7CEX(VHAB3o&UJ(5bxHl8-}c?hi>#8Vm@TQe{rm4s}x zCRe+(@lJD89iNoaR~b9k@-|*sqHSk$*k!xI$VGXw3j|k^IW}y$^tsbGSi6-3PJ0WB zUH)S?$i9z6fLRTHWDD+0c@+l68Qy(AC>%5IOYa}`WuYylVn5<+nPG70ZJkBGf?mqs@CjYp<3!G>_J)B0ZKBdl3 zglo5ok&7gMAaME1jy@fd5K(?X5>VwYI~L;JsQHLoaGz4oE2?Enx3Lm3 zrj&MfL)L#}t$+ZW69pmU9j)H_R3Wi=pqK(ZSWqv2-@iNa*u%!bmHm-c!m=z3*RH|1 z0!cO}V4b3kO)1g&Ok%+F&7>4I2T15|=sZR@S;2~b?TR8-VUyK?H(`?%i-x+%3YCl3 zj)6O;u{NJf0%MyxP_Qp^z~}`x2@Gv57}x4NjlFe{XR-102MU&s#wuA3awT0vfx0A-1ne3dD0s35jGwHbV5O8Z&=fNX?6AIGkXoR3Q@d55Ua-IhM4+dX z`ieb&Z#e}-PQ-3pb2p@_IiJNN3X!$>JWlGD{N15 zQX6SQ2gF>js9OnG`!gOT?0t_$bMnCbJ7Ux#l&33 zvAD92q~ehR$nB(n47+MeFjr5B{PNh>@{h*D+y7Sah{~H%XE!DKibP!3(t$GYXwteG zGtec8WQwTlBZid`<+_M9w?taTQs7`~%+^p{{KE)D9zPp^XoD-iaX~6T(t6mgZu|v* z>yb&TPgJXTeAKlfL-8fjA~&vS?X{84H;&qK*ZG{&a;pm**y{R;zc6nV(gx4cNN?hQ z;<5kfudzzZt80;=CoAL?%DGo=oOjQpes_zkS;t=_EUPFAr!4AIZe#rb8a$e^X!oBl ztfI4J^cULLOC&M_NA$01!?Y(GrVTbA{E**lwflxk=(#fO^s!<}+{D7ZGomh-7c$ zJD}_>yUJr(7P*WAokeS7Q3rmRm0(h#=?@aQrfh;3WD{T6Lnb{1Zmu@cKtQ{H;aVWy zKEP)y8TxMbZ3Lv9HnPBqFXzhRtGNzb-J$KDXH(obB#XLqK5CUfWUP7eIqguaOeIxS+p3-S}4C-PM;Kyy2Ci4OkJ zNaPY-V;@z#AYDl=(HU1J1KL#IUK6|AfI?^gm379~@dJ(9uWZmq-KRGjGJVkS+JD5+ z2RD$4TRHrDE_``<|LNW7-Nz62e*<#4Dn0l7%y0kzAOJ~3K~#90?45aoF9x?S1_8`5 DfYk*b