From 7c08173c911c1f1e69c0a7f7c2066d5aa3b24e11 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 4 Jan 2025 13:30:51 +0000 Subject: [PATCH 01/11] Rat Start --- code/modules/mob/holder.dm | 2 +- .../onmob/clothing/critters_shoulder.dmi | Bin 660 -> 1713 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 99fb4282f942..3f8080254913 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -154,7 +154,7 @@ icon = 'icons/mob/animal.dmi' icon_state = "rat_white" w_class = SIZE_TINY - flags_equip_slot = null + flags_equip_slot = SLOT_EAR /obj/item/holder/rat/white icon_state = "rat_white" diff --git a/icons/mob/humans/onmob/clothing/critters_shoulder.dmi b/icons/mob/humans/onmob/clothing/critters_shoulder.dmi index 6942db939867241c2b611913689ae79f44929f7f..4132bdee0e6f5b0c982ccc8a1ff44a4edba777d2 100644 GIT binary patch delta 1580 zcmZwHdpOg390%~ZYvs^IoE}RhHqOH+*Vx(RkWCp4jTv($%I#E=TiMU`NGiD%7NawB zDYF$3g`Sc_b+kAgCZXe!RTj(E%-R{J$Mc-a_mA)Q{r&IteLtV)Tcp9&G0pMDyX%0r zfk7aU4i4)|0D)AL5j3u?rrbvuSgP`v%r|uae0+S!WHOJ(O9g?Nnwn536qm~lba6Of zWqv-`{~*dC2=7Wi5kzovK7>W-=;*+9L0WS%>@A@vdn-S8gtN_enf`=~!}xR`4{vXu z5Na3<26J?DL}Spz05SrBs4UFpRMS~yd51k+6QU@2sVD0y3Nub0Yh;#@0s^AlBO}o$ z6vW6VBQ4Fy$jBNFH#ITApin`9fi~9Gfh3ZPv$LJ8Ej1*>W#2vw8Vxlw18pg2QtDOW z2zVb5YI-PKd12>ggaeQ2?K>QycFn0+$gEpV@ot!D@B4)dPYZkrgPS6f4^h|USE&+l z>AkL5+6Q;8o8Dxw?L;v%(+y9JwV$_`r{BCeE|^ipvq9n*-m|!!LTeC6{Q=Gu?VEV* zLwQUfAG_t}>>X`E4nrRaE$R)1X``Ht>8{64X2AlZBnkxs0aP;juJuN8gv*Pg!Ptut$XUrN zU8QPmRdR;D^5X62;5fntnO8mZg|l}<_&BFQf*UQb4;_R@X4@r=l}#gR7i6ON=J1hq zHZ1wz{x*KAC=e!Ss)qv2%#yQm{B__qQixq&E6}ebg^KwUzcIA|TF0raja3r6Gl)yJ zIF@{PS&t`6k#F;r;#xg+ZJ<|s$Nan+6mF+V+O)?_AE<&{m(n(cq(Pc zC8<2PJ>_+wMq@%EIt|IstA?*AHuqdjyG|FB8IlKnd=6ip2zeVd>)z3?uXjy)ue#BQ5z)z!Z>7un zrh9L@XQUwuG}P0OM!_4TeulN0CHabd4V2IEZ-8Kb;rJz0B~_aZXg!>`-06&w_wYPr z5vp#LTqF{Vg^PT;nvHksQi*cDOe8+`$hH~BP)Jmgq^lp&nzk!dsCItFpy7m(V6J~` za$cggLDt=h&JG{x&1{eT*1WBboilF<(UkAHcB!W73N8NBLw&vStgqCP%!bQA`H+FV z*XtuA z?+ir1rB*8@zC2)3Tz(VIAG?!%KX)sSM{a3?X9UqP5>9mIV0)GdMiEkp|?{PgY_~t9J>X9XBPybIGMoJ!d9`#AHns zjrkjMAdijVWQ^I9?|#}qZHz^pE{-7?jc;e%?Q2#LX#F|y(mHOj3H$yp)_ZgJm?KA$ z@3!Z=RnA$qCmIAEV_;C(Q~1`Teq-t5BA+IJOANzFHpUK!2G^k>^ppUe2IDreLFwO<#6 z*d+1HKlh}zM9t#e`AdIKCErj?z4u#ffl$mFey~Lc+8t|W1wyRi2U)eIP}N%C5Cgw{ z+|^$Ni|5wlym8d{FaJTYDt_WeLl-T_Rk_x!bLS|n*{B!%!+t{F0^I{~{q^PIS+*LY z{St@6zf{W4)#L2@y}4xnCy6qTpWpX!u3!=W4T{YN`#&)o-sjPgRl3y$vfI Date: Sat, 4 Jan 2025 13:29:34 +0000 Subject: [PATCH 02/11] Community Awards --- code/game/verbs/ooc.dm | 3 ++ code/modules/client/client_procs.dm | 42 ++++++++++++++++++++++++++++ icons/ooc.dmi | Bin 2525 -> 2883 bytes 3 files changed, 45 insertions(+) diff --git a/code/game/verbs/ooc.dm b/code/game/verbs/ooc.dm index 0e14c87c0bc2..baef64860370 100644 --- a/code/game/verbs/ooc.dm +++ b/code/game/verbs/ooc.dm @@ -85,6 +85,9 @@ prefix += "[icon2html('icons/ooc.dmi', GLOB.clients, "Donator")]" if(isCouncil(src)) prefix += "[icon2html('icons/ooc.dmi', GLOB.clients, "WhitelistCouncil")]" + var/comm_award = find_community_award_icons() + if(comm_award) + prefix += comm_award if(admin_holder) var/list/rank_icons = icon_states('icons/ooc.dmi') var/rankname = admin_holder.rank diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index a299eac56230..8f572eaecc1d 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -933,3 +933,45 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( winset(src, "mapwindow.map", "right-click=false") winset(src, "default.Shift", "is-disabled=true") winset(src, "default.ShiftUp", "is-disabled=true") + +GLOBAL_LIST_INIT(community_awards, get_community_awards()) + +/client + var/list/community_awards = list() + +/proc/get_community_awards() + var/list/awards_file = file2list("config/community_awards.txt") + var/list/processed_awards = list() + for(var/awardee in awards_file) + if(!length(awardee)) + return FALSE + if(copytext(awardee,1,2) == "#") + continue + + //Split the line at every "-" + var/list/split_awardee = splittext(awardee, "-") + if(!length(split_awardee)) + return FALSE + + //ckey is before the first "-" + var/ckey = ckey(split_awardee[1]) + if(!ckey) + continue + processed_awards[ckey] = list() + + //given_awards follows the first "-" + var/list/given_awards = list() + if(!(length(split_awardee) >= 2)) + continue + given_awards = split_awardee.Copy(2) + for(var/the_award in given_awards) + processed_awards[ckey] += ckeyEx(the_award) + + return processed_awards + +/client/proc/find_community_award_icons() + if(GLOB.community_awards[ckey]) + var/full_prefix = "" + for(var/award in GLOB.community_awards[ckey]) + full_prefix += "[icon2html('icons/ooc.dmi', GLOB.clients, award)]" + return full_prefix diff --git a/icons/ooc.dmi b/icons/ooc.dmi index 8b15b1e492395f9695fcd5ded7fac2e2992c87ff..88542856dabd2392c348e1e1d52802d8cce86ef2 100644 GIT binary patch literal 2883 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 hzcFq8a{aKD?LUBu*iK^` literal 2525 zcmZWrXH=7E6MfzgNCE*dpddX=F3v060TJbpGQH@yvdoAr7 zLv12xyJ}wU`3{s?dJmcXm)AJctrv3e*D{2;+&-GjXmDi9m!iPocR@{C&jl;fwR<@G z#A#eslI?`lp*1Vh-uEPY)^S$*!a0v-&%)R9y0-+lb1JpB-Y14M%%53(bjB>zU)N+1 zLk^O@7f!j>I<+_ITxzfDm{;7HqOb-{jpWk@ZIiuUd2(E%o*5mO>@9_DPCTcZj1tPV z*`C~%T6SY90H{qjm%RZg<%<=0C%7iq?9k%%q_X(FCAee68tvwa;5y{*W?#uYB&6;` zG`rmoJw5%7chv&M993O!dq#aaRU@9YjC+?-p^zFp&zPQLWO0-2=i!#TYxX--x0siQ zb5YXnqV8Q`#|;LkYchgPuI^yjZW&NjNeyVrhNJT#FfaH$GZzR}?jyRh8Q2I-ZOCH= z!?aS+*>~FlRCX^Su%DGO?Z8g_wv1ndERgV_Q{syNh*M7{aWts1k{H=DY+H&@oOOe; z+m)o9b$0r6h1-Q8hE9Kk6f=>`O7(3uh{W7Z;p>&3=!Fqs=&c9^aI`=cmyvY2YV)#1 z+X)?9fc~AX{KJ6!xWq$xHNN0ujs{0e3NYVoY8;M{rufLHby41 z>wNzv2oqxPO;FX&1{${uSFWS(90H;p$n`~4g+p^P*DdpJsuM#Vl`?AM;JSg0yBA~f zmAfouWRuRX?OZe4Wg2#BI_kS#@6os?D`)xbtbf@Cj2y}E%J+5i=2R}8RWaMGG|M=X zBkttB!;&`h+&9>2QebRTd$cWw(Gy}K6+CjD7B3nWoHa%n$SDThod`#?eO`)%`2A%| zRL7}2K)Z4DXK>vvj-h(~2vUZuqyZ|k z((a?cAFTRATJ&}ov}o9;Id7NzF7ajDWzbOhU2H?9Wa>JWUF zb^~GzUJ3aES+%o~roqfqd_vauL)a+Mrti7^G4(7F(XC0_lfPY9yJ)3PduRY&Ia^Ox zuEXjH#w11q`F`_6T4Yn~Ku5}Slv%>kjs9Q=m2lC#Q59X64(fe9h!o@#v@}xZ!Wd z{N0L+q-KU7_KPh!bB6ln(AznPez`h(KZ7Br6ZxnOI#U*}R|pD96(3P21)AU>2y?() zw^PJ4g5{wxKOz6N)Ljc#Aw{GMp~kur58$n&nIn8h#-tY}eFxEwu6Wp*c@8=^;$2WJ7 zz6i^_PI_-X+4Eq`Q65!52R_oM#oFvh?AP?jqI?pKavJ*7I#<<4T}r zE~K+G3o$$7s&E{#`O_^9e@TOdJY!krWDvyJoRQ&g+TdM?L_k+Oq~@;;J+SGXKjEiHq>@Mqel5?8lCzOQ-|flp(gVVO4Pd6nq#; zS#&J~HLb=(!SO6bTr(C-5^%1d^dB|g8R>xfY49HYL#ICiVjAKx5-3!~bB&n%oNxHt z2iN$jl8$&l+XLemM})3MB(K44d)9^-wd46=wOVKyQrj}C~1}=66b)i^ZQLE0-q zq?*WAe$(vxHB&u(>KVLxhpUuil<#Z%KbR%xC!MSQ$5=dE)=;3xhl=BE)P$6Nm@;yX8}CcJ5B z2~+5(auDsI#n~l1p4b%}7-B|0cE(NVg1#ZU_1Z{YR!b#%i>~Uu2vEITMIdS*b@t~G zC@V@>8Di}Na}8zZ+dZ4yl;t67sA^DYMk7L5tJs!ko?(+xT*8v`-j6m1@#-qjF~K4A zA5;eUd@@(@%?P*`C}259cmp1+Ml3_u3|4Ook69k#72sW1Dl31%JBD@^AdGmKJWYY^{j?`Dl4$~Us3 z*GNxZkw25nnykX7K9`#PIF3(APHsEN-<4Q`@CTI@b(W76;65zIPK*kIgtgpl)Wp7nPcqb?es}|Vc*s5V zLEBHn3HUQOH!D7>OB18wQdb From d55fa9e04418c3c4b1bf2f0bcbd7df67ab5f7afa Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 4 Jan 2025 14:47:33 +0000 Subject: [PATCH 03/11] spawning rats --- code/modules/client/preferences_gear.dm | 5 + code/modules/mob/holder.dm | 12 ++- .../mob/living/simple_animal/friendly/rat.dm | 92 ++++++++++++++++--- 3 files changed, 95 insertions(+), 14 deletions(-) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index db613cbb563d..c150ae32316e 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -992,3 +992,8 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) display_name = "Cut-throat razor" path = /obj/item/weapon/straight_razor cost = 3 + +/datum/gear/misc/cheese + display_name = "Cheese" + path = /obj/item/reagent_container/food/snacks/cheesewedge/mature + cost = 1 diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 3f8080254913..00a734831d88 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -152,7 +152,7 @@ name = "rat" desc = "It's a big rat." icon = 'icons/mob/animal.dmi' - icon_state = "rat_white" + icon_state = "rat_gray" w_class = SIZE_TINY flags_equip_slot = SLOT_EAR @@ -176,3 +176,13 @@ /obj/item/holder/rat/brown/Old_Timmy name = "Old Timmy" desc = "An ancient looking rat from the old days of the colony." + + +/obj/item/holder/rat/pet + name = "Pet Rat" + desc = "This is someone's pet rat. I wonder what it's doing here." + +/obj/item/holder/rat/pet/ikit + name = "Ikit" + desc = "An albino rat with a tiny collar around it's neck, it must belong to someone. Hope it doesn't have some sort of genetically engineered disease or something..." + icon_state = "rat_white" diff --git a/code/modules/mob/living/simple_animal/friendly/rat.dm b/code/modules/mob/living/simple_animal/friendly/rat.dm index a89c59ab3d5b..7c346c1b72b7 100644 --- a/code/modules/mob/living/simple_animal/friendly/rat.dm +++ b/code/modules/mob/living/simple_animal/friendly/rat.dm @@ -14,12 +14,6 @@ * Rat types */ -/mob/living/simple_animal/mouse/rat/white - body_color = "white" - icon_state = "rat_white" - desc = "It's a small laboratory rat." - holder_type = /obj/item/holder/rat/white - /mob/living/simple_animal/mouse/rat/gray body_color = "gray" icon_state = "rat_gray" @@ -29,11 +23,26 @@ body_color = "brown" icon_state = "rat_brown" holder_type = /obj/item/holder/rat/brown + +/mob/living/simple_animal/mouse/rat/brown/Old_Timmy + name = "Old Timmy" + desc = "An ancient looking rat from the old days of the colony." + response_help = "pets" + response_disarm = "gently pushes aside" + response_harm = "splats" + holder_type = /obj/item/holder/rat/brown/Old_Timmy + /mob/living/simple_animal/mouse/rat/black body_color = "black" icon_state = "rat_black" holder_type = /obj/item/holder/rat/black +/mob/living/simple_animal/mouse/rat/white + body_color = "white" + icon_state = "rat_white" + desc = "It's a small laboratory rat." + holder_type = /obj/item/holder/rat/white + /mob/living/simple_animal/mouse/rat/white/Milky name = "Milky" desc = "An escaped test rat from the Weyland-Yutani Research Facility. Hope it doesn't have some sort of genetically engineered disease or something..." @@ -43,10 +52,67 @@ response_harm = "stamps on" holder_type = /obj/item/holder/rat/white/Milky -/mob/living/simple_animal/mouse/rat/brown/Old_Timmy - name = "Old Timmy" - desc = "An ancient looking rat from the old days of the colony." - response_help = "pets" - response_disarm = "gently pushes aside" - response_harm = "splats" - holder_type = /obj/item/holder/rat/brown/Old_Timmy +/* + Specific Pets for Frozen's Rat Collecting Competition +*/ +/mob/living/simple_animal/mouse/rat/pet + name = "Pet Rat" + desc = "This is someone's pet rat. I wonder what it's doing here." + holder_type = /obj/item/holder/rat/pet + +/mob/living/simple_animal/mouse/rat/pet/ikit + name = "Ikit" + desc = "An albino rat with a tiny collar around it's neck, it must belong to someone. Hope it doesn't have some sort of genetically engineered disease or something..." + body_color = "white" + icon_state = "rat_white" + holder_type = /obj/item/holder/rat/pet/ikit + +/* + Spawning those rats from cheese. +*/ +/obj/item/reagent_container/food/snacks/cheesewedge/attack_self(mob/user) + if(!user.client || user.client.spawned_pet) + return ..() + if(GLOB.community_awards[user.ckey]) + for(var/award in GLOB.community_awards[user.ckey]) + if(award == "RatKing") + return spawn_pet_rat(user) + ..() + +/client + /// Whether or not the client has spawned a unique pet. + var/spawned_pet = FALSE + +/obj/item/reagent_container/food/snacks/cheesewedge/proc/spawn_pet_rat(mob/user) + if(!user.client || user.client.spawned_pet) + return FALSE + if(tgui_alert(user, "Do you want to spawn your pet rat?", "Spawn Pet", list("Yes", "No")) != "Yes") + return FALSE + + var/list/pet_rats = file2list("config/pet_rats.txt") + var/rat_path + for(var/rat_owner in pet_rats) + if(!length(rat_owner)) + return FALSE + if(copytext(rat_owner,1,2) == "#") + continue + + //Split the line at every "-" + var/list/split_rat_owner = splittext(rat_owner, " - ") + if(!length(split_rat_owner)) + return FALSE + + //ckey is before the first "-" + var/ckey = ckey(split_rat_owner[1]) + if(!ckey || (ckey != user.ckey)) + continue + + if(length(split_rat_owner) >= 2) + rat_path = split_rat_owner[2] + break + + if(!rat_path) + return FALSE + + new rat_path(user.loc) + user.client.spawned_pet = TRUE From 802c1b1ea74a6664b2c97f6a96b0aa1b7e478a7e Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 4 Jan 2025 14:50:12 +0000 Subject: [PATCH 04/11] black rat --- code/modules/mob/holder.dm | 3 +++ code/modules/mob/living/simple_animal/friendly/rat.dm | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index 00a734831d88..e319189351d9 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -186,3 +186,6 @@ name = "Ikit" desc = "An albino rat with a tiny collar around it's neck, it must belong to someone. Hope it doesn't have some sort of genetically engineered disease or something..." icon_state = "rat_white" + +/obj/item/holder/rat/pet/black + icon_state = "rat_black" diff --git a/code/modules/mob/living/simple_animal/friendly/rat.dm b/code/modules/mob/living/simple_animal/friendly/rat.dm index 7c346c1b72b7..6e08334fc204 100644 --- a/code/modules/mob/living/simple_animal/friendly/rat.dm +++ b/code/modules/mob/living/simple_animal/friendly/rat.dm @@ -60,6 +60,11 @@ desc = "This is someone's pet rat. I wonder what it's doing here." holder_type = /obj/item/holder/rat/pet +/mob/living/simple_animal/mouse/rat/pet/black + body_color = "black" + icon_state = "rat_black" + holder_type = /obj/item/holder/rat/pet/black + /mob/living/simple_animal/mouse/rat/pet/ikit name = "Ikit" desc = "An albino rat with a tiny collar around it's neck, it must belong to someone. Hope it doesn't have some sort of genetically engineered disease or something..." From 8752d72251cac42b824d7a6cb9ea11ebb7954eec Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 4 Jan 2025 14:58:17 +0000 Subject: [PATCH 05/11] comment lint --- .../modules/mob/living/simple_animal/friendly/rat.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/rat.dm b/code/modules/mob/living/simple_animal/friendly/rat.dm index 6e08334fc204..0a1fd29bbd54 100644 --- a/code/modules/mob/living/simple_animal/friendly/rat.dm +++ b/code/modules/mob/living/simple_animal/friendly/rat.dm @@ -52,9 +52,9 @@ response_harm = "stamps on" holder_type = /obj/item/holder/rat/white/Milky -/* - Specific Pets for Frozen's Rat Collecting Competition -*/ + +//Specific Pets for Frozen's Rat Collecting Competition + /mob/living/simple_animal/mouse/rat/pet name = "Pet Rat" desc = "This is someone's pet rat. I wonder what it's doing here." @@ -72,9 +72,9 @@ icon_state = "rat_white" holder_type = /obj/item/holder/rat/pet/ikit -/* - Spawning those rats from cheese. -*/ + +//Spawning those rats from cheese. + /obj/item/reagent_container/food/snacks/cheesewedge/attack_self(mob/user) if(!user.client || user.client.spawned_pet) return ..() From fa9a7346b316231cc5c3bb1b363cb7b02fc7b8a4 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 4 Jan 2025 16:13:33 +0000 Subject: [PATCH 06/11] marvin --- code/modules/mob/holder.dm | 6 +++--- code/modules/mob/living/simple_animal/friendly/rat.dm | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index e319189351d9..e6d563c3a418 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -178,9 +178,9 @@ desc = "An ancient looking rat from the old days of the colony." -/obj/item/holder/rat/pet - name = "Pet Rat" - desc = "This is someone's pet rat. I wonder what it's doing here." +/obj/item/holder/rat/marvin + name = "Marvin" + desc = "A sleek well kept rat with a tiny collar around it's neck, it must belong to someone. For a rodent it appears remarkably clean and hygenic." /obj/item/holder/rat/pet/ikit name = "Ikit" diff --git a/code/modules/mob/living/simple_animal/friendly/rat.dm b/code/modules/mob/living/simple_animal/friendly/rat.dm index 0a1fd29bbd54..06967edac61b 100644 --- a/code/modules/mob/living/simple_animal/friendly/rat.dm +++ b/code/modules/mob/living/simple_animal/friendly/rat.dm @@ -60,10 +60,12 @@ desc = "This is someone's pet rat. I wonder what it's doing here." holder_type = /obj/item/holder/rat/pet -/mob/living/simple_animal/mouse/rat/pet/black +/mob/living/simple_animal/mouse/rat/pet/marvin + name = "Marvin" + desc = "A sleek well kept rat with a tiny collar around it's neck, it must belong to someone. For a rodent it appears remarkably clean and hygenic." body_color = "black" icon_state = "rat_black" - holder_type = /obj/item/holder/rat/pet/black + holder_type = /obj/item/holder/rat/pet/marvin /mob/living/simple_animal/mouse/rat/pet/ikit name = "Ikit" From 5067569f1c419cf1a2c2a3f2391718ba3312c48c Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 4 Jan 2025 16:14:35 +0000 Subject: [PATCH 07/11] grammar --- code/modules/mob/living/simple_animal/friendly/rat.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/friendly/rat.dm b/code/modules/mob/living/simple_animal/friendly/rat.dm index 06967edac61b..50768c75575d 100644 --- a/code/modules/mob/living/simple_animal/friendly/rat.dm +++ b/code/modules/mob/living/simple_animal/friendly/rat.dm @@ -62,14 +62,14 @@ /mob/living/simple_animal/mouse/rat/pet/marvin name = "Marvin" - desc = "A sleek well kept rat with a tiny collar around it's neck, it must belong to someone. For a rodent it appears remarkably clean and hygenic." + desc = "A sleek well kept rat with a tiny collar around its neck, it must belong to someone. For a rodent it appears remarkably clean and hygenic." body_color = "black" icon_state = "rat_black" holder_type = /obj/item/holder/rat/pet/marvin /mob/living/simple_animal/mouse/rat/pet/ikit name = "Ikit" - desc = "An albino rat with a tiny collar around it's neck, it must belong to someone. Hope it doesn't have some sort of genetically engineered disease or something..." + desc = "An albino rat with a tiny collar around its neck, it must belong to someone. Hope it doesn't have some sort of genetically engineered disease or something..." body_color = "white" icon_state = "rat_white" holder_type = /obj/item/holder/rat/pet/ikit From b386e5bcb53fd1c40fedcce2b742943b5ad43b1c Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 4 Jan 2025 16:22:23 +0000 Subject: [PATCH 08/11] fix --- code/modules/mob/holder.dm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm index e6d563c3a418..5cd0ce186b26 100644 --- a/code/modules/mob/holder.dm +++ b/code/modules/mob/holder.dm @@ -177,15 +177,16 @@ name = "Old Timmy" desc = "An ancient looking rat from the old days of the colony." +/obj/item/holder/rat/pet + name = "Pet Rat" + desc = "This is someone's pet rat. I wonder what it's doing here." -/obj/item/holder/rat/marvin +/obj/item/holder/rat/pet/marvin name = "Marvin" desc = "A sleek well kept rat with a tiny collar around it's neck, it must belong to someone. For a rodent it appears remarkably clean and hygenic." + icon_state = "rat_black" /obj/item/holder/rat/pet/ikit name = "Ikit" desc = "An albino rat with a tiny collar around it's neck, it must belong to someone. Hope it doesn't have some sort of genetically engineered disease or something..." icon_state = "rat_white" - -/obj/item/holder/rat/pet/black - icon_state = "rat_black" From 785b470ab77a93932d370b1e2a22b6232375a638 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sun, 5 Jan 2025 17:06:00 +0000 Subject: [PATCH 09/11] icon file change revert --- icons/ooc.dmi | Bin 2883 -> 2525 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/ooc.dmi b/icons/ooc.dmi index 88542856dabd2392c348e1e1d52802d8cce86ef2..8b15b1e492395f9695fcd5ded7fac2e2992c87ff 100644 GIT binary patch literal 2525 zcmZWrXH=7E6MfzgNCE*dpddX=F3v060TJbpGQH@yvdoAr7 zLv12xyJ}wU`3{s?dJmcXm)AJctrv3e*D{2;+&-GjXmDi9m!iPocR@{C&jl;fwR<@G z#A#eslI?`lp*1Vh-uEPY)^S$*!a0v-&%)R9y0-+lb1JpB-Y14M%%53(bjB>zU)N+1 zLk^O@7f!j>I<+_ITxzfDm{;7HqOb-{jpWk@ZIiuUd2(E%o*5mO>@9_DPCTcZj1tPV z*`C~%T6SY90H{qjm%RZg<%<=0C%7iq?9k%%q_X(FCAee68tvwa;5y{*W?#uYB&6;` zG`rmoJw5%7chv&M993O!dq#aaRU@9YjC+?-p^zFp&zPQLWO0-2=i!#TYxX--x0siQ zb5YXnqV8Q`#|;LkYchgPuI^yjZW&NjNeyVrhNJT#FfaH$GZzR}?jyRh8Q2I-ZOCH= z!?aS+*>~FlRCX^Su%DGO?Z8g_wv1ndERgV_Q{syNh*M7{aWts1k{H=DY+H&@oOOe; z+m)o9b$0r6h1-Q8hE9Kk6f=>`O7(3uh{W7Z;p>&3=!Fqs=&c9^aI`=cmyvY2YV)#1 z+X)?9fc~AX{KJ6!xWq$xHNN0ujs{0e3NYVoY8;M{rufLHby41 z>wNzv2oqxPO;FX&1{${uSFWS(90H;p$n`~4g+p^P*DdpJsuM#Vl`?AM;JSg0yBA~f zmAfouWRuRX?OZe4Wg2#BI_kS#@6os?D`)xbtbf@Cj2y}E%J+5i=2R}8RWaMGG|M=X zBkttB!;&`h+&9>2QebRTd$cWw(Gy}K6+CjD7B3nWoHa%n$SDThod`#?eO`)%`2A%| zRL7}2K)Z4DXK>vvj-h(~2vUZuqyZ|k z((a?cAFTRATJ&}ov}o9;Id7NzF7ajDWzbOhU2H?9Wa>JWUF zb^~GzUJ3aES+%o~roqfqd_vauL)a+Mrti7^G4(7F(XC0_lfPY9yJ)3PduRY&Ia^Ox zuEXjH#w11q`F`_6T4Yn~Ku5}Slv%>kjs9Q=m2lC#Q59X64(fe9h!o@#v@}xZ!Wd z{N0L+q-KU7_KPh!bB6ln(AznPez`h(KZ7Br6ZxnOI#U*}R|pD96(3P21)AU>2y?() zw^PJ4g5{wxKOz6N)Ljc#Aw{GMp~kur58$n&nIn8h#-tY}eFxEwu6Wp*c@8=^;$2WJ7 zz6i^_PI_-X+4Eq`Q65!52R_oM#oFvh?AP?jqI?pKavJ*7I#<<4T}r zE~K+G3o$$7s&E{#`O_^9e@TOdJY!krWDvyJoRQ&g+TdM?L_k+Oq~@;;J+SGXKjEiHq>@Mqel5?8lCzOQ-|flp(gVVO4Pd6nq#; zS#&J~HLb=(!SO6bTr(C-5^%1d^dB|g8R>xfY49HYL#ICiVjAKx5-3!~bB&n%oNxHt z2iN$jl8$&l+XLemM})3MB(K44d)9^-wd46=wOVKyQrj}C~1}=66b)i^ZQLE0-q zq?*WAe$(vxHB&u(>KVLxhpUuil<#Z%KbR%xC!MSQ$5=dE)=;3xhl=BE)P$6Nm@;yX8}CcJ5B z2~+5(auDsI#n~l1p4b%}7-B|0cE(NVg1#ZU_1Z{YR!b#%i>~Uu2vEITMIdS*b@t~G zC@V@>8Di}Na}8zZ+dZ4yl;t67sA^DYMk7L5tJs!ko?(+xT*8v`-j6m1@#-qjF~K4A zA5;eUd@@(@%?P*`C}259cmp1+Ml3_u3|4Ook69k#72sW1Dl31%JBD@^AdGmKJWYY^{j?`Dl4$~Us3 z*GNxZkw25nnykX7K9`#PIF3(APHsEN-<4Q`@CTI@b(W76;65zIPK*kIgtgpl)Wp7nPcqb?es}|Vc*s5V zLEBHn3HUQOH!D7>OB18wQdb literal 2883 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 hzcFq8a{aKD?LUBu*iK^` From 9576cfa0f6058cf86aabb76faf12b49bc11565d0 Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 18 Jan 2025 18:04:46 +0000 Subject: [PATCH 10/11] . --- code/modules/client/client_procs.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 8f572eaecc1d..0a17503854e0 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -936,9 +936,6 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list( GLOBAL_LIST_INIT(community_awards, get_community_awards()) -/client - var/list/community_awards = list() - /proc/get_community_awards() var/list/awards_file = file2list("config/community_awards.txt") var/list/processed_awards = list() From e85c5275289328cd725b10e0a831c29fbb4fc55e Mon Sep 17 00:00:00 2001 From: forest2001 Date: Sat, 18 Jan 2025 18:14:08 +0000 Subject: [PATCH 11/11] cheese pref remove --- code/modules/client/preferences_gear.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 8b0a38e7e4b4..77023cf7951a 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -997,8 +997,3 @@ GLOBAL_LIST_EMPTY_TYPED(gear_datums_by_name, /datum/gear) display_name = "Cheap wrist watch" path = /obj/item/clothing/accessory/wrist/watch cost = 1 // Cheap and crappy - -/datum/gear/misc/cheese - display_name = "Cheese" - path = /obj/item/reagent_container/food/snacks/cheesewedge/mature - cost = 1