From 1015987d1223e59f91c3db986a056b6bacc6f097 Mon Sep 17 00:00:00 2001 From: Jerry Wester Date: Thu, 6 Oct 2022 23:38:16 -0600 Subject: [PATCH 1/7] driderman, driderman, does whatever a spider can --- code/__DEFINES/inventory.dm | 3 ++- .../sprite_accessories/legs_and_taurs.dm | 1 + .../human/innate_abilities/customization.dm | 15 ++++++++++++++- code/modules/mob/living/carbon/human/species.dm | 13 +++++++++++++ .../living/carbon/human/species_types/arachnid.dm | 4 ---- 5 files changed, 30 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 6c83a46514..344ccc1b9b 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -103,11 +103,12 @@ #define STYLE_SNEK_TAURIC (1<<2) //taur-friendly suits #define STYLE_PAW_TAURIC (1<<3) #define STYLE_HOOF_TAURIC (1<<4) -#define STYLE_ALL_TAURIC (STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC|STYLE_HOOF_TAURIC) +#define STYLE_ALL_TAURIC (STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC|STYLE_HOOF_TAURIC|STYLE_ARACHNID_TAURIC) #define STYLE_NO_ANTHRO_ICON (1<<5) //When digis fit the default sprite fine and need no copypasted states. This is the case of skirts and winter coats, for example. #define USE_SNEK_CLIP_MASK (1<<6) #define USE_QUADRUPED_CLIP_MASK (1<<7) #define USE_TAUR_CLIP_MASK (USE_SNEK_CLIP_MASK|USE_QUADRUPED_CLIP_MASK) +#define STYLE_ARACHNID_TAURIC (1<<8) //digitigrade legs settings. #define NOT_DIGITIGRADE 0 diff --git a/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm b/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm index 11fde50a37..843082265e 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/legs_and_taurs.dm @@ -97,6 +97,7 @@ icon_state = "drider" color_src = MUTCOLORS extra = TRUE + taur_mode = STYLE_ARACHNID_TAURIC /datum/sprite_accessory/taur/eevee name = "Eevee" diff --git a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm index 621dc58650..59786c9200 100644 --- a/code/modules/mob/living/carbon/human/innate_abilities/customization.dm +++ b/code/modules/mob/living/carbon/human/innate_abilities/customization.dm @@ -116,7 +116,7 @@ if(new_snout) H.dna.features["mam_snouts"] = new_snout H.update_body() - + else if (select_alteration == "Wings") var/new_color = input(owner, "Choose your wing color:", "Race change","#"+H.dna.features["wings_color"]) as color|null if(new_color) @@ -167,6 +167,10 @@ H.dna.features["mam_tail"] = new_tail if(new_tail != "None") H.dna.features["taur"] = "None" + var/datum/action/innate/spin_web/SW = locate(/datum/action/innate/spin_web) in H.actions + var/datum/action/innate/spin_cocoon/SC = locate(/datum/action/innate/spin_cocoon) in H.actions + SC?.Remove(H) + SW?.Remove(H) H.update_body() else if (select_alteration == "Taur body") @@ -182,7 +186,16 @@ var/new_taur new_taur = input(owner, "Choose your character's tauric body:", "Tauric Alteration") as null|anything in snowflake_taur_list if(new_taur) + var/datum/action/innate/spin_web/SW = locate(/datum/action/innate/spin_web) in H.actions + var/datum/action/innate/spin_cocoon/SC = locate(/datum/action/innate/spin_cocoon) in H.actions + SC?.Remove(H) + SW?.Remove(H) H.dna.features["taur"] = new_taur + if(new_taur == "Drider") + SW = new + SC = new + SC.Grant(H) + SW.Grant(H) if(new_taur != "None") H.dna.features["mam_tail"] = "None" H.update_body() diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index afceabf2a6..8855137c99 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -527,6 +527,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) H.physiology.footstep_type = FOOTSTEP_MOB_CLAW if(STYLE_SNEK_TAURIC) H.physiology.footstep_type = FOOTSTEP_MOB_CRAWL + if(STYLE_ARACHNID_TAURIC) + if(!istype(H.dna.species,/datum/species/arachnid)) + var/datum/action/innate/spin_web/SW = new + var/datum/action/innate/spin_cocoon/SC = new + SC.Grant(H) + SW.Grant(H) else H.physiology.footstep_type = null else @@ -602,6 +608,13 @@ GLOBAL_LIST_EMPTY(roundstart_race_names) if((TRAIT_ROBOTIC_ORGANISM in inherent_traits) && C.hud_used) C.hud_used.coolant_display.clear() + if(ishuman(C)) + var/mob/living/carbon/human/H = C + var/datum/action/innate/spin_web/SW = locate(/datum/action/innate/spin_web) in H.actions + var/datum/action/innate/spin_cocoon/SC = locate(/datum/action/innate/spin_cocoon) in H.actions + SC?.Remove(H) + SW?.Remove(H) + SEND_SIGNAL(C, COMSIG_SPECIES_LOSS, src) // shamelessly inspired by antag_datum.remove_blacklisted_quirks() diff --git a/code/modules/mob/living/carbon/human/species_types/arachnid.dm b/code/modules/mob/living/carbon/human/species_types/arachnid.dm index 7495e2500e..5358f9fee5 100644 --- a/code/modules/mob/living/carbon/human/species_types/arachnid.dm +++ b/code/modules/mob/living/carbon/human/species_types/arachnid.dm @@ -54,10 +54,6 @@ /datum/species/arachnid/on_species_loss(mob/living/carbon/human/H) . = ..() - var/datum/action/innate/spin_web/SW = locate(/datum/action/innate/spin_web) in H.actions - var/datum/action/innate/spin_cocoon/SC = locate(/datum/action/innate/spin_cocoon) in H.actions - SC?.Remove(H) - SW?.Remove(H) /datum/action/innate/spin_web name = "Spin Web" From 5bcd1fe2ae020368753274de5acfeed92fd32a87 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 12 Oct 2022 21:49:46 -0400 Subject: [PATCH 2/7] Updates DreamAnnotate to v2 --- .github/workflows/ci_suite.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 34c1ec1b0e..dc93324bff 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -45,7 +45,7 @@ jobs: tools/bootstrap/python -m mapmerge2.dmm_test ~/dreamchecker > ${GITHUB_WORKSPACE}/output-annotations.txt 2>&1 - name: Annotate Lints - uses: yogstation13/DreamAnnotate@v1 + uses: yogstation13/DreamAnnotate@v2 if: always() with: outputFile: output-annotations.txt From 30bf2312f31bd4a37734801f9ba6d2c5a59dcaac Mon Sep 17 00:00:00 2001 From: zerothebigboy Date: Tue, 18 Oct 2022 23:37:40 -0400 Subject: [PATCH 3/7] seizure --- .../new_player/sprite_accessories/ears.dm | 76 ++++++++++++++++++ .../new_player/sprite_accessories/horns.dm | 14 ++++ icons/mob/32x64_mutant_bodyparts.dmi | Bin 0 -> 707 bytes modular_citadel/icons/mob/32x64_mam_ears.dmi | Bin 0 -> 4347 bytes 4 files changed, 90 insertions(+) create mode 100644 icons/mob/32x64_mutant_bodyparts.dmi create mode 100644 modular_citadel/icons/mob/32x64_mam_ears.dmi diff --git a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm index 628a5e53ac..fd32ceefd6 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm @@ -411,3 +411,79 @@ name = "Wolf" icon_state = "wolf" matrixed_sections = MATRIX_RED_BLUE + +/****************************************** +*************** Tall Ears ***************** +*******************************************/ + +/datum/sprite_accessory/ears/human/bnnuy + name = "Bnnuy (Tall)" + icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' + icon_state = "bnnuy" + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/ears/mam_ears/bnnuy + name = "Bnnuy (Tall)" + icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' + icon_state = "bnnuy" + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/ears/human/bnnuy2 + name = "Bnnuy (Alt) (Tall)" + icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' + icon_state = "bnnuy2" + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/ears/mam_ears/bnnuy2 + name = "Bnnuy (Alt) (Tall)" + icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' + icon_state = "bnnuy2" + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/ears/human/bunnytall + name = "Bunny (Tall)" + icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' + icon_state = "bunnytall" + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/ears/mam_ears/bunnytall + name = "Bunny (Tall)" + icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' + icon_state = "bunnytall" + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/ears/human/sandfox + name = "Sandfox (Tall)" + icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' + icon_state = "sandfox" + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/ears/mam_ears/sandfox + name = "Sandfox (Tall)" + icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' + icon_state = "sandfox" + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/ears/human/shadekinround + name = "Shadekin (Round) (Tall)" + icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' + icon_state = "shadekinround" + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/ears/mam_ears/shadekinround + name = "Shadekin (Round) (Tall)" + icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' + icon_state = "shadekinround" + matrixed_sections = MATRIX_RED_GREEN + +/datum/sprite_accessory/ears/human/jackalope + name = "jackalope (Tall)" + icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' + icon_state = "jackalope" + matrixed_sections = MATRIX_RED + +/datum/sprite_accessory/ears/mam_ears/jackalope + name = "jackalope (Tall)" + icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' + icon_state = "jackalope" + matrixed_sections = MATRIX_RED \ No newline at end of file diff --git a/code/modules/mob/dead/new_player/sprite_accessories/horns.dm b/code/modules/mob/dead/new_player/sprite_accessories/horns.dm index 0d097b24f0..545e44b48d 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/horns.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/horns.dm @@ -40,3 +40,17 @@ /datum/sprite_accessory/horns/short name = "Short" icon_state = "short" + +/datum/sprite_accessory/horns/tepper + name = "Tepper" + icon = 'icons/mob/32x64_mutant_bodyparts.dmi' + icon_state = "tepper" + color_src = MATRIXED + matrixed_sections = MATRIX_RED + +/datum/sprite_accessory/horns/stag + name = "Stag" + icon = 'icons/mob/32x64_mutant_bodyparts.dmi' + icon_state = "stag" + color_src = MATRIXED + matrixed_sections = MATRIX_RED diff --git a/icons/mob/32x64_mutant_bodyparts.dmi b/icons/mob/32x64_mutant_bodyparts.dmi new file mode 100644 index 0000000000000000000000000000000000000000..2304646739af6d21be0bd6307f68e272fd9e59b5 GIT binary patch literal 707 zcmV;!0zCbRP)C9|j) zWCj;!T2W$dDu``}sR<~Mj$ezif~%hk*kJ&FkuPsgMRC*s00F;AL_t(&f$f*SPU|of z#y>|iO4B91d4Zs`QpJ`!FThQPJ606~V+Isf1|(Li0*Nszo5cuAXLz~m^p6ue35XFm zzr>Zl<8wYAM_mjM1VIqQPbApAgZfWj&1q}SB1^04skz+6X>Bn*6bBluesg^W#`}-Jbz^ZjPqD0;OaKTNqSox^+lHBB+K;%vn+qG zJGji#zgoE0H^5z~^=Kx5`+1}De=Asw?(gN++PIJcx0x1~wZ9ky)<- zi-lG~G`~GsZp4|YFo^K%E&OAG5I%fWAP2Nx7Sc5h3g0cIHc%5ORf+7^{woSum-s)w`|lF4{YbN} pf%!jVV4vs?Uo#*Gf*^?R!hh}#SD31|xtx{z+%LII$x-c$j-`pTiWSXh z?rcm-`ns$VMvPdAMeNK@%}tspZDYSete#n_w#+* z`P|tpN?;`b0Jgw?w!HuVpi|$6;zrq?4bM@c?B?#z>v>aidtXTwBkn?kb6raF=)RZlT+eJMJ^b#B zWjO_;G!WqMl&pCglpbimXaDl~4Udm@+)}gp`LVj7`YV%_=>J<{<51WOFNZx(3N|Te z-3GTMPF-*Ls{Ekxm{JjDpFxn;@AaF8W8QshRVPf^nXden|45O45b`S-SDCi;-CWup zrUtBvUU~KQ+VE^!&M9wWAJl1Gt+1Ye9HN>f0H`g)ZBJi}e>gXE8a-$Se#^@^lWJBh z7oT{S(;*juHt_Mm0;iL~kCCTXNiAFobY+{*If&;EUXL?|#^mNs2kU_4&yRBV56K_j zb_Tyq>lbkL{Q9Py6>q3wX28U#b7Xe>{02ZXc^eG?ZlwbXKAIrK=EHL8sqPB9fl9?w zz?H43K<6F+lzRq{JBs~F1-%vkn}VQ)n48*6v+f3kwu{8r&{EFGL4Z9(vP8y}4gCYx z_MX48my?w=HUXh%r{&%`R$q^h{Nd!s>e)Ym^c?4vhnhF@oah1^xS<}gOetbz!|EB$ zu{wHb3vx3i%5VCYe^{=sfs{_TI2ClzC+5Snq|J^BujbZ(*GbJ3Gtur@>TdMiDP#_m1+4K@!(UigjO!r?L;8ykDk_ z|I*hw5_l7=`Kh$#Nx}7eC4P`GA|nAWlw8zAfMJTPoYc!bD<6d{8@i}UnguCN=v zdQJIo4frQzN?D!gi>JGz2I^R5mlY8cL(B3p?t1G7m9^QC%ffJUzC=HX>14T2%-Ky- z`)ocuPxh%RJ0kL>rHy5`r*Y$TQ-D4 zoNIaDPDpSB4|yEL4H*ow?Uz3pT0uWrwC!&Aqio#{6#qPClFWQLs-m;ew^U={&DvM{ z?pE_|zx(6oI-7YQ5iK8!vXFU1y6Q=I#Mtgvn&3VIg>PKox+N+>fFh~ zkO75M<59+IxxW+4f1M8h)e5C&smiB*;`WiG?+$oX+e9HP2@w7~I!V&6dxBu!ZQDI~ zWbW-gJ7Rv5u4C0_kc=Gc(7sV@noK;P5>lo z-XOQauITq0zD+4y-)jY0YSlnt%i8zB!r=d^3fhqxH-k31q9*Rr`CL3+Rx|MO*c{7k zO>f{MkzHd0t7=kcdSs6cj1{b0AAAq_7eA=nRERgK7CR-uzi$nZnrf0j;tR4@RCd>LD94qfo~j@AX=k$uJZ}u_6ZCn+`mq z3OU%YLEJyqK_^T9*U6ZeaNf}Ii8D8j{z;L?PVH#A$J&zXv@22X0)h-!@u2nD z(L7vLE~;K5ipu_XdV~_Ke>3aHC&d1u%Rx=mZAi|$s#Zc;CcdKMqwixdHI&ioKLjW2 zsJwepN%C1Uyw%@dCnISn{Ak_S#oUk>28GzupR`_xu8ZZ8xr{@B%E0?i9AjaRtv?ys5c29hbmQnY*L9 z{|b?|%DydVN_+lFpB@2WYlhJ>Iir~c2(nZX$maO>Wk6w78^0TZIL_^V=c_r%p8EGY3JdafOvdRAUo=qqZm4X%wv=8+vtVValVt9fBWr!jV(p8-o-&Wg zZhoHsWJR@lMEqJVCQZ5dKm$fAY1Xryi)Pd~HZ|KTnrUHeDvom3@-S(en*}PfT)Eq<2S}Q?Ndldw}>Y)A=r^~AvxnW)WGni`yY>cO+E|=(iRXGCMo$jW> z7(i3W?)efku6jr%C+x(=G{xqM#ZCH2A{vt1oZmCQcwflFt?cE;@m8V&Yi?;<)G|qx zXIwh$Lif6IIW{7zcfesIYh{ABF&mx-sRDm%K=>S~j2-9r^W8_+1{j4oR2~gRMw@{# z47u)9jv8}VA}F26%yN(L>Ih!-kQ}_K zXFURak7gXyS$`T$@5&563OYFFjojFWG-dsQs+_U6JXG*&CfzAIM~Csq&R~A`qie(@ zqbbroT&o}(1D?M*LloJLT&<>ewtxJz6%AN76V`TeF`b)t^M+wBOJ7^YLMS3Zb4*sD z_Mc{wGGg*}JsQ%O9c{A68r?D3U7pz22JP!1ty>aw5%x7p#xan_^E7<(7ddsH!K4`B z1AN=|_Z@%!zd*0s3VECrR)D|?WD4MCb=F~AL>gW4eOHa>WZ2l#1=QegIp0y*?N10Y zzupj^nfqdzPyzi}GI!Q(DW+Ob&D}FG;v2EqlT)!Eseci-{Zc!AzM=*N>rE%#!`b9h zEsC54HJ{hq;xyDAVEQwG(r|;oSTid*k=WZc{{X2q)-fd;Y1*k4g=mZi! zDGzcB+!GjaXlg*B9^$t><$cBEgJ|#36p9?jt=loyL-keD?6X5oReuVAB%{d8wj7RmMG;0BjDsdqXX2}cpHg_LAWuGo4?xz>P7 zzh*#;M$n+Gw*9HF*^~|?0=`ibl5D6Fc_6cK4`BH4>*<%dK^#;1#pQ9^x{v|ISMU`+ zVf$Q$kMWVA2LZt^m+Td%TV`rL5G2IhE1L_R4lI2IWg4SH+@G(j(4L>vX%1oYFPA@m&EC-X$?{E0C|+o8 zAQ_^aWF3!I@WF*^C6$E;!mA6D!*gn3tZ*X?sY_=r>(eq9U2?c5KeJ8W(|{Zpvnc$L ze0-PoSnvWpd|MFT*N!T=B(+*A3E!pI43>#aTzktbsi>p~8JjdF#70e-qSr4EJe_?# z(wZ z6r?}h)Oi?%pDz+b!I9=}4h##zqkuZ)@(`}4=z>J0=@38ZRYu;LH(CSz5V8K`O7epf zgeHv>jAx3cW=-QDI+yRNP_OLL{m%Je`Tu$Lkr59#WyP%T-*4Nh`nM#i|0pS!H+(t3 zB&i)&wNl`#c?CDhm*)TK0No`gn*?o7)uTHVt>KRhskLRiC_~zqJ%i$srK1br4L-R( zL<>SwaUlO`4|kNLGrVaY@AMFnae3YB3DQPovmswCgLM$FIojjcwA-OYA5!tSu488; z?8d_9^m%_4-}rDBY?sT70KkL^SDn*aO~0~ji!rX@Dz|fl8LtCkHj67Oe2N#XXW$lJ zKisX*Ir}a6xZ>JStshQ*wPnWStJfdZvbuzxDqp;pZNN`oDs&lC^UDdx% zrN(4E+zlrmJ~&W26!z{8=)ANiqPqE-=8uBu4m4S0a?xc%Pn9goU~2WSXxTPfP!SRO zE52uCzUYiBHoxNKb!de&9SNnIU7EWd3dSgI`*FbO7=Grtcs2I`l8QF!$!bbjfF_)8 z(4*v@6utCMnX^>A2>&jSfcotyNbKhGJfc4E7enxW{AK^1vuD<^i)uy|6+N1=+YA7H M=A3Prwa<-z0xjjeR{#J2 literal 0 HcmV?d00001 From 2fd981a05a4e1551c412369c118572c0897d1d39 Mon Sep 17 00:00:00 2001 From: zerothebigboy Date: Tue, 18 Oct 2022 23:57:02 -0400 Subject: [PATCH 4/7] penis --- code/modules/mob/dead/new_player/sprite_accessories/ears.dm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm index fd32ceefd6..e177fc6069 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm @@ -420,6 +420,7 @@ name = "Bnnuy (Tall)" icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' icon_state = "bnnuy" + color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN /datum/sprite_accessory/ears/mam_ears/bnnuy @@ -432,6 +433,7 @@ name = "Bnnuy (Alt) (Tall)" icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' icon_state = "bnnuy2" + color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN /datum/sprite_accessory/ears/mam_ears/bnnuy2 @@ -444,6 +446,7 @@ name = "Bunny (Tall)" icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' icon_state = "bunnytall" + color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN /datum/sprite_accessory/ears/mam_ears/bunnytall @@ -456,6 +459,7 @@ name = "Sandfox (Tall)" icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' icon_state = "sandfox" + color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN /datum/sprite_accessory/ears/mam_ears/sandfox @@ -468,6 +472,7 @@ name = "Shadekin (Round) (Tall)" icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' icon_state = "shadekinround" + color_src = MATRIXED matrixed_sections = MATRIX_RED_GREEN /datum/sprite_accessory/ears/mam_ears/shadekinround @@ -480,6 +485,7 @@ name = "jackalope (Tall)" icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' icon_state = "jackalope" + color_src = MATRIXED matrixed_sections = MATRIX_RED /datum/sprite_accessory/ears/mam_ears/jackalope From 274269c2b86f29f9b3dce2d72f6aeac4f7e643a3 Mon Sep 17 00:00:00 2001 From: Dan-Neposh Date: Wed, 19 Oct 2022 01:32:34 -0400 Subject: [PATCH 5/7] surely my code works every time --- .../antagonists/clockcult/clock_scriptures/scripture_cyborg.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_cyborg.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_cyborg.dm index 43d029b043..943b61b9be 100644 --- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_cyborg.dm +++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_cyborg.dm @@ -48,9 +48,11 @@ //These are exactly the same as the default scriptures, but cyborgs don't need a second person to create them /datum/clockwork_scripture/create_object/mania_motor/cyborg invokers_required = 1 + tier = SCRIPTURE_PERIPHERAL multiple_invokers_used = FALSE /datum/clockwork_scripture/create_object/clockwork_obelisk/cyborg invokers_required = 1 + tier = SCRIPTURE_PERIPHERAL multiple_invokers_used = FALSE From 1f8f5dc071856098f67aea5a741827835a3fa9e3 Mon Sep 17 00:00:00 2001 From: zerothebigboy Date: Wed, 19 Oct 2022 03:49:33 -0400 Subject: [PATCH 6/7] cocka --- .../dead/new_player/sprite_accessories/ears.dm | 6 +++--- .../dead/new_player/sprite_accessories/horns.dm | 12 ++++-------- icons/mob/32x64_mutant_bodyparts.dmi | Bin 707 -> 708 bytes 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm index e177fc6069..928c4351c3 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/ears.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/ears.dm @@ -482,14 +482,14 @@ matrixed_sections = MATRIX_RED_GREEN /datum/sprite_accessory/ears/human/jackalope - name = "jackalope (Tall)" + name = "Jackalope (Tall)" icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' icon_state = "jackalope" color_src = MATRIXED matrixed_sections = MATRIX_RED /datum/sprite_accessory/ears/mam_ears/jackalope - name = "jackalope (Tall)" + name = "Jackalope (Tall)" icon = 'modular_citadel/icons/mob/32x64_mam_ears.dmi' icon_state = "jackalope" - matrixed_sections = MATRIX_RED \ No newline at end of file + matrixed_sections = MATRIX_RED diff --git a/code/modules/mob/dead/new_player/sprite_accessories/horns.dm b/code/modules/mob/dead/new_player/sprite_accessories/horns.dm index 545e44b48d..33b513f947 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories/horns.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories/horns.dm @@ -41,16 +41,12 @@ name = "Short" icon_state = "short" -/datum/sprite_accessory/horns/tepper - name = "Tepper" +/datum/sprite_accessory/horns/teppy + name = "Teppy (Tall)" icon = 'icons/mob/32x64_mutant_bodyparts.dmi' - icon_state = "tepper" - color_src = MATRIXED - matrixed_sections = MATRIX_RED + icon_state = "teppy" /datum/sprite_accessory/horns/stag - name = "Stag" + name = "Stag (Tall)" icon = 'icons/mob/32x64_mutant_bodyparts.dmi' icon_state = "stag" - color_src = MATRIXED - matrixed_sections = MATRIX_RED diff --git a/icons/mob/32x64_mutant_bodyparts.dmi b/icons/mob/32x64_mutant_bodyparts.dmi index 2304646739af6d21be0bd6307f68e272fd9e59b5..3d94f2353822288d9b8372d8f5ec9f0476eb7a74 100644 GIT binary patch delta 591 zcmV-V0Cdt>gwL!-jV!a!AV3xRA_p z=IRU%8$SY5jipKZ)3jk4wK`68rn|JNu}pft@uy67TtpMv%d>cJiZqLhof0b+#kuZa z#iVAr>Y&&%X8lKpu~dI0;Qk@UEPtpveOHv26{Xr>Rg^#M4!)H6XC?fv-+=G6(%y;# zk87>V+Z`;t$FdjmuS2a~N5^`N0sH+hMi2x+5ClOG1n~}$H(AHN_6+gsb2mVo3 z7$o=^Y{D*q^AMpd5K3PRIvv)P@J)j%^lPCE!xQt1Tu&(c(wcio=TRohiL1ZO3|Ih>e&wwBZ df*@WCFBctC6!Z_Bv-AJ}002ovPDHLkV1h;pAe;aI delta 590 zcmV-U0o63?KSwl5(Bn*6bBlu zesg^W#`}-Jbz^ZjPrk3C*bNf#YuWw9Q8$(<0Q-V2D2=GusgWS)4y7{*Ehgjsr6_k zfctr)^M5N?jPCPR%smXfdKgFMb97j*yD@?w2!bF8f*^=rh`Px#``XtH4f7bVr+}HU zUFh+c06bw_!4tiD4BpKV)E^=nh{qAP9mW ci0{IG?haR&!d(vL{Qv*}07*qoM6N<$g66mgm;e9( From 24ee6077c7d85cbfa5b77e7845d65013b6bd8bc8 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Sun, 23 Oct 2022 00:18:03 -0300 Subject: [PATCH 7/7] push changes --- code/__DEFINES/spans.dm | 1 + code/__HELPERS/game.dm | 10 ++--- code/__HELPERS/mobs.dm | 38 ++++++++++++------- code/controllers/subsystem/shuttle.dm | 4 +- .../game/machinery/computer/communications.dm | 12 +++--- code/modules/admin/verbs/randomverbs.dm | 2 +- code/modules/cargo/centcom_podlauncher.dm | 2 +- code/modules/events/_event.dm | 2 +- .../modules/mob/dead/new_player/new_player.dm | 2 +- code/modules/mob/living/death.dm | 3 +- code/modules/mob/say.dm | 8 +++- .../security_levels/keycard_authentication.dm | 4 +- code/modules/shuttle/arrivals.dm | 4 +- code/modules/spells/spell_types/curse.dm | 2 +- .../reagents/chemistry/reagents/astrogen.dm | 2 +- 15 files changed, 54 insertions(+), 42 deletions(-) diff --git a/code/__DEFINES/spans.dm b/code/__DEFINES/spans.dm index 50fc40d5ca..b6b633d91a 100644 --- a/code/__DEFINES/spans.dm +++ b/code/__DEFINES/spans.dm @@ -56,6 +56,7 @@ #define span_icon(str) ("" + str + "") #define span_info(str) ("" + str + "") #define span_interface(str) ("" + str + "") +#define span_linkify(str) ("" + str + "") #define span_looc(str) ("" + str + "") #define span_medal(str) ("" + str + "") #define span_medradio(str) ("" + str + "") diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 5578b1f22a..f0f8eb817c 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -567,14 +567,12 @@ return A.loc -/proc/AnnounceArrival(var/mob/living/carbon/human/character, var/rank) +///Send a message in common radio when a player arrives +/proc/announce_arrival(mob/living/carbon/human/character, rank) if(!SSticker.IsRoundInProgress() || QDELETED(character)) return - var/area/A = get_area(character) - var/message = "\ - [character.real_name] ([rank]) has arrived at the station at \ - [A.name]." - deadchat_broadcast(message, follow_target = character, message_type=DEADCHAT_ARRIVALRATTLE) + var/area/player_area = get_area(character) + deadchat_broadcast(" has arrived at the station at [player_area.name].", "[character.real_name] ([rank])", follow_target = character, message_type=DEADCHAT_ARRIVALRATTLE) if((!GLOB.announcement_systems.len) || (!character.mind)) return if((character.mind.assigned_role == "Cyborg") || (character.mind.assigned_role == character.mind.special_role)) diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 4cd82f9e66..dca8c184f2 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -382,17 +382,27 @@ GLOBAL_LIST_EMPTY(species_datums) for(var/i in 1 to step_count) step(X, pick(NORTH, SOUTH, EAST, WEST)) -/proc/deadchat_broadcast(message, mob/follow_target=null, turf/turf_target=null, speaker_key=null, message_type=DEADCHAT_REGULAR) - message = "[message]" - for(var/mob/M in GLOB.player_list) - var/datum/preferences/prefs - if(M.client && M.client.prefs) - prefs = M.client.prefs - else - prefs = new +// Displays a message in deadchat, sent by source. source is not linkified, message is, to avoid stuff like character names to be linkified. +// Automatically gives the class deadsay to the whole message (message + source) +/proc/deadchat_broadcast(message, source=null, mob/follow_target=null, turf/turf_target=null, speaker_key=null, message_type=DEADCHAT_REGULAR, admin_only=FALSE) + message = span_deadsay("[source][span_linkify(message)]") + for(var/mob/M in GLOB.player_list) + var/chat_toggles = TOGGLES_DEFAULT_CHAT + var/toggles = TOGGLES_DEFAULT + var/list/ignoring + if(M.client?.prefs) + var/datum/preferences/prefs = M.client?.prefs + chat_toggles = prefs.chat_toggles + toggles = prefs.toggles + ignoring = prefs.ignoring + if(admin_only) + if (!M.client?.holder) + return + else + message += span_deadsay(" (This is viewable to admins only).") var/override = FALSE - if(M.client && M.client.holder && (prefs.chat_toggles & CHAT_DEAD)) + if(M.client?.holder && (chat_toggles & CHAT_DEAD)) override = TRUE if(HAS_TRAIT(M, TRAIT_SIXTHSENSE)) override = TRUE @@ -402,15 +412,15 @@ GLOBAL_LIST_EMPTY(species_datums) continue if(M.stat != DEAD && !override) continue - if(speaker_key && (speaker_key in prefs.ignoring)) + if(speaker_key && (speaker_key in ignoring)) continue switch(message_type) if(DEADCHAT_DEATHRATTLE) - if(prefs.toggles & DISABLE_DEATHRATTLE) + if(toggles & DISABLE_DEATHRATTLE) continue if(DEADCHAT_ARRIVALRATTLE) - if(prefs.toggles & DISABLE_ARRIVALRATTLE) + if(toggles & DISABLE_ARRIVALRATTLE) continue if(isobserver(M)) @@ -427,9 +437,9 @@ GLOBAL_LIST_EMPTY(species_datums) var/turf_link = TURF_LINK(M, turf_target) rendered_message = "[turf_link] [message]" - to_chat(M, rendered_message) + to_chat(M, rendered_message, avoid_highlighting = speaker_key == M.key) else - to_chat(M, message) + to_chat(M, message, avoid_highlighting = speaker_key == M.key) //Used in chemical_mob_spawn. Generates a random mob based on a given gold_core_spawnable value. /proc/create_random_mob(spawn_location, mob_class = HOSTILE_SPAWN) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index da295d70e2..dbec272fe8 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -254,7 +254,7 @@ SUBSYSTEM_DEF(shuttle) var/area/A = get_area(user) log_shuttle("[key_name(user)] has called the emergency shuttle.") - deadchat_broadcast(" has called the shuttle at [A.name].", "[user.real_name]", user) //, message_type=DEADCHAT_ANNOUNCEMENT) + deadchat_broadcast(" has called the shuttle at [span_name("[A.name]")].", span_name("[user.real_name]"), user, message_type=DEADCHAT_ANNOUNCEMENT) if(call_reason) SSblackbox.record_feedback("text", "shuttle_reason", 1, "[call_reason]") log_shuttle("Shuttle call reason: [call_reason]") @@ -293,7 +293,7 @@ SUBSYSTEM_DEF(shuttle) emergency.cancel(get_area(user)) log_shuttle("[key_name(user)] has recalled the shuttle.") message_admins("[ADMIN_LOOKUPFLW(user)] has recalled the shuttle.") - deadchat_broadcast(" has recalled the shuttle from [get_area_name(user, TRUE)].", "[user.real_name]", user) //, message_type=DEADCHAT_ANNOUNCEMENT) + deadchat_broadcast(" has recalled the shuttle from [span_name("[get_area_name(user, TRUE)]")].", span_name("[user.real_name]"), user, message_type=DEADCHAT_ANNOUNCEMENT) return 1 /datum/controller/subsystem/shuttle/proc/canRecall() diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 7c22846ece..fc3eaf5ca4 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -159,7 +159,7 @@ // Only notify people if an actual change happened log_game("[key_name(usr)] has changed the security level to [params["newSecurityLevel"]] with [src] at [AREACOORD(usr)].") message_admins("[ADMIN_LOOKUPFLW(usr)] has changed the security level to [params["newSecurityLevel"]] with [src] at [AREACOORD(usr)].") - deadchat_broadcast(" has changed the security level to [params["newSecurityLevel"]] with [src] at [span_name("[get_area_name(usr, TRUE)]")].", usr, src.loc, message_type=DEADCHAT_ANNOUNCEMENT) + deadchat_broadcast(" has changed the security level to [params["newSecurityLevel"]] with [src] at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr, message_type=DEADCHAT_ANNOUNCEMENT) alert_level_tick += 1 if ("deleteMessage") @@ -198,7 +198,7 @@ var/associates = emagged ? "the Syndicate": "CentCom" usr.log_talk(message, LOG_SAY, tag = "message to [associates]") - deadchat_broadcast(" has messaged [associates], \"[message]\" at [span_name("[get_area_name(usr, TRUE)]")].", usr, src.loc, message_type = DEADCHAT_ANNOUNCEMENT) + deadchat_broadcast(" has messaged [associates], \"[message]\" at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr, message_type = DEADCHAT_ANNOUNCEMENT) COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN) if ("purchaseShuttle") var/can_buy_shuttles_or_fail_reason = can_buy_shuttles(usr) @@ -281,7 +281,7 @@ minor_announce(message, title = "Outgoing message to allied station") usr.log_talk(message, LOG_SAY, tag = "message to the other server") message_admins("[ADMIN_LOOKUPFLW(usr)] has sent a message to the other server\[s].") - deadchat_broadcast(" has sent an outgoing message to the other station(s).", usr, src.loc, message_type = DEADCHAT_ANNOUNCEMENT) + deadchat_broadcast(" has sent an outgoing message to the other station(s).", "[usr.real_name]", usr, message_type = DEADCHAT_ANNOUNCEMENT) COOLDOWN_START(src, important_action_cooldown, IMPORTANT_ACTION_COOLDOWN) if ("setState") @@ -345,12 +345,12 @@ revoke_maint_all_access() log_game("[key_name(usr)] disabled emergency maintenance access.") message_admins("[ADMIN_LOOKUPFLW(usr)] disabled emergency maintenance access.") - deadchat_broadcast(" disabled emergency maintenance access at [span_name("[get_area_name(usr, TRUE)]")].", usr, src.loc, message_type = DEADCHAT_ANNOUNCEMENT) + deadchat_broadcast(" disabled emergency maintenance access at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr, message_type = DEADCHAT_ANNOUNCEMENT) else make_maint_all_access() log_game("[key_name(usr)] enabled emergency maintenance access.") message_admins("[ADMIN_LOOKUPFLW(usr)] enabled emergency maintenance access.") - deadchat_broadcast(" enabled emergency maintenance access at [span_name("[get_area_name(usr, TRUE)]")].", usr, src.loc, message_type = DEADCHAT_ANNOUNCEMENT) + deadchat_broadcast(" enabled emergency maintenance access at [span_name("[get_area_name(usr, TRUE)]")].", span_name("[usr.real_name]"), usr, message_type = DEADCHAT_ANNOUNCEMENT) /obj/machinery/computer/communications/ui_data(mob/user) var/list/data = list( @@ -555,7 +555,7 @@ else input = user.treat_message(input) //Adds slurs and so on. Someone should make this use languages too. SScommunications.make_announcement(user, is_ai, input) - deadchat_broadcast(" made a priority announcement from [span_name("[get_area_name(usr, TRUE)]")].", user, src.loc, message_type=DEADCHAT_ANNOUNCEMENT) + deadchat_broadcast(" made a priority announcement from [span_name("[get_area_name(usr, TRUE)]")].", span_name("[user.real_name]"), user, message_type=DEADCHAT_ANNOUNCEMENT) /obj/machinery/computer/communications/proc/post_status(command, data1, data2) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 85b3d9eaa4..6f55466015 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -491,7 +491,7 @@ Traitors and the like can also be revived with the previous role mostly intact. GLOB.data_core.manifest_inject(new_character) if(alert(new_character,"Would you like an active AI to announce this character?",,"No","Yes")=="Yes") - AnnounceArrival(new_character, new_character.mind.assigned_role) + announce_arrival(new_character, new_character.mind.assigned_role) var/msg = "[admin] has respawned [player_key] as [new_character.real_name]." message_admins(msg) diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm index e4060de1a2..8af43b8b00 100644 --- a/code/modules/cargo/centcom_podlauncher.dm +++ b/code/modules/cargo/centcom_podlauncher.dm @@ -595,7 +595,7 @@ else return //if target is null and we don't have a specific target, cancel if (effectAnnounce) - deadchat_broadcast("A special package is being launched at the station!", turf_target = target) + deadchat_broadcast("A special package is being launched at the station!", turf_target = target, message_type=DEADCHAT_ANNOUNCEMENT) var/list/bouttaDie = list() for (var/mob/living/target_mob in target) bouttaDie.Add(target_mob) diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index 640dbc468f..3abe65a790 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -118,7 +118,7 @@ if(random) log_game("Random Event triggering: [name] ([typepath])") if (alert_observers) - deadchat_broadcast("[name] has just been[random ? " randomly" : ""] triggered!") //STOP ASSUMING IT'S BADMINS! + deadchat_broadcast(" has just been[random ? " randomly" : ""] triggered!", "[name]", message_type=DEADCHAT_ANNOUNCEMENT) //STOP ASSUMING IT'S BADMINS! return E //Special admins setup diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index cfcb881977..453f654c2c 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -494,7 +494,7 @@ if(SSshuttle.arrivals) SSshuttle.arrivals.QueueAnnounce(humanc, rank) else - AnnounceArrival(humanc, rank) + announce_arrival(humanc, rank) AddEmploymentContract(humanc) if(GLOB.highlander) to_chat(humanc, "THERE CAN BE ONLY ONE!!!") diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm index cbf0de51de..65433c2bd9 100644 --- a/code/modules/mob/living/death.dm +++ b/code/modules/mob/living/death.dm @@ -93,8 +93,7 @@ var/turf/T = get_turf(src) if(mind && mind.name && mind.active && !istype(T.loc, /area/ctf) && !(signal & COMPONENT_BLOCK_DEATH_BROADCAST)) - var/rendered = "[mind.name] has died at [get_area_name(T)]." - deadchat_broadcast(rendered, follow_target = src, turf_target = T, message_type=DEADCHAT_DEATHRATTLE) + deadchat_broadcast(" has died at [get_area_name(T)].", "[mind.name]", follow_target = src, turf_target = T, message_type=DEADCHAT_DEATHRATTLE) if (client && client.prefs && client.prefs.auto_ooc) if (!(client.prefs.chat_toggles & CHAT_OOC)) client.prefs.chat_toggles ^= CHAT_OOC diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index d8ef440ef9..f2d4e249d2 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -139,10 +139,14 @@ var/spanned = say_quote(say_emphasis(message)) message = emoji_parse(message) - var/rendered = "DEAD: [name][alt_name] [emoji_parse(spanned)]" + var/source = "DEAD: [name][alt_name]" + var/rendered = " [emoji_parse(spanned)]" log_talk(message, LOG_SAY, tag="DEAD") client?.last_activity = world.time - deadchat_broadcast(rendered, follow_target = src, speaker_key = key) + var/displayed_key = key + if(client?.holder?.fakekey) + displayed_key = null + deadchat_broadcast(rendered, source, follow_target = src, speaker_key = displayed_key) /mob/proc/check_emote(message) if(message[1] == "*") diff --git a/code/modules/security_levels/keycard_authentication.dm b/code/modules/security_levels/keycard_authentication.dm index 562dc17182..65fc9d3278 100644 --- a/code/modules/security_levels/keycard_authentication.dm +++ b/code/modules/security_levels/keycard_authentication.dm @@ -116,10 +116,10 @@ GLOBAL_DATUM_INIT(keycard_events, /datum/events, new) message_admins("[ADMIN_LOOKUPFLW(triggerer)] triggered and [ADMIN_LOOKUPFLW(confirmer)] confirmed event [event]") var/area/A1 = get_area(triggerer) - deadchat_broadcast(" triggered [event] at [A1.name].", "[triggerer]", triggerer) + deadchat_broadcast(" triggered [event] at [span_name("[A1.name]")].", span_name("[triggerer]"), triggerer, message_type=DEADCHAT_ANNOUNCEMENT) var/area/A2 = get_area(confirmer) - deadchat_broadcast(" confirmed [event] at [A2.name].", "[confirmer]", confirmer) + deadchat_broadcast(" confirmed [event] at [span_name("[A2.name]")].", span_name("[confirmer]"), confirmer, message_type=DEADCHAT_ANNOUNCEMENT) switch(event) if(KEYCARD_RED_ALERT) set_security_level(SEC_LEVEL_RED) diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index 8322c6cdd8..e0ca10db8a 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -195,9 +195,9 @@ /obj/docking_port/mobile/arrivals/proc/QueueAnnounce(mob, rank) if(mode != SHUTTLE_CALL) - AnnounceArrival(mob, rank) + announce_arrival(mob, rank) else - LAZYADD(queued_announces, CALLBACK(GLOBAL_PROC, .proc/AnnounceArrival, mob, rank)) + LAZYADD(queued_announces, CALLBACK(GLOBAL_PROC, .proc/announce_arrival, mob, rank)) /obj/docking_port/mobile/arrivals/vv_edit_var(var_name, var_value) switch(var_name) diff --git a/code/modules/spells/spell_types/curse.dm b/code/modules/spells/spell_types/curse.dm index 9449e4a5d0..43340f98ef 100644 --- a/code/modules/spells/spell_types/curse.dm +++ b/code/modules/spells/spell_types/curse.dm @@ -8,7 +8,7 @@ GLOBAL_VAR_INIT(curse_of_madness_triggered, FALSE) GLOB.curse_of_madness_triggered = message // So latejoiners are also afflicted. - deadchat_broadcast("A Curse of Madness has stricken the station, shattering their minds with the awful secret: \"[message]\"") + deadchat_broadcast("A [span_name("Curse of Madness")] has stricken the station, shattering their minds with the awful secret: \"[message]\"", message_type=DEADCHAT_ANNOUNCEMENT) for(var/mob/living/carbon/human/H in GLOB.player_list) if(H.stat == DEAD) diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm index bdc599a5e2..2be1a97873 100644 --- a/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm +++ b/modular_citadel/code/modules/reagents/chemistry/reagents/astrogen.dm @@ -163,7 +163,7 @@ I'd like to point out from my calculations it'll take about 60-80 minutes to die if(-INFINITY to 30) to_chat(M, "Your body disperses from existence, as you become one with the universe.") to_chat(M, "As your body disappears, your consciousness doesn't. Should you find a way back into the mortal coil, your memories of your previous life remain with you. (At the cost of staying in character while dead. Failure to do this may get you banned from this chem. You are still obligated to follow your directives if you play a midround antag, you do not remember the afterlife IC)")//Legalised IC OOK? I have a suspicion this won't make it past the review. At least it'll be presented as a neat idea! If this is unacceptable how about the player can retain living memories across lives if they die in this way only. - deadchat_broadcast("[M] has become one with the universe, meaning that their IC conciousness is continuous in a new life. If they find a way back to life, they are allowed to remember their previous life. Be careful what you say. If they abuse this, bwoink the FUCK outta them.") + deadchat_broadcast(" has become one with the universe, meaning that their IC conciousness is continuous in a new life. If they find a way back to life, they are allowed to remember their previous life. Be careful what you say. If they abuse this, bwoink the FUCK outta them.", "[M]", M, message_type=DEADCHAT_ANNOUNCEMENT) M.visible_message("[M] suddenly disappears, their body evaporating from existence, freeing [M] from their mortal coil.") message_admins("[M] (ckey: [M.ckey]) has become one with the universe, and have continuous memories thoughout their lives should they find a way to come back to life (such as an inteligence potion, midround antag, ghost role).") SSblackbox.record_feedback("tally", "fermi_chem", 1, "Astral obliterations")