From 906d0d5a676e030b97145d00c9c6811a839abbb7 Mon Sep 17 00:00:00 2001 From: Certh Date: Tue, 24 Nov 2015 14:32:48 +0100 Subject: [PATCH 1/4] Tiny grammar fix --- code/modules/mob/living/simple_animal/parrot.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index fdaebc34f8a..44d29f118b7 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -343,7 +343,7 @@ //Search for item to steal parrot_interest = search_for_item() if(parrot_interest) - custom_emote(1,"looks in [parrot_interest]'s direction and takes flight") + custom_emote(1,"looks in [parrot_interest]'s direction and takes flight.") parrot_state = PARROT_SWOOP | PARROT_STEAL icon_state = "parrot_fly" return @@ -731,4 +731,4 @@ /mob/living/simple_animal/parrot/proc/parrot_hear(var/message="") if(!message || stat) return - speech_buffer.Add(message) \ No newline at end of file + speech_buffer.Add(message) From 1ce08fee64472a28d09cc021efb321599caabb5c Mon Sep 17 00:00:00 2001 From: Certh Date: Tue, 24 Nov 2015 16:03:16 +0100 Subject: [PATCH 2/4] Tiny grammar fix --- code/game/objects/items/blueprints.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index d40a9adb9d9..62e888a3028 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -48,7 +48,7 @@ /obj/item/areaeditor/permit name = "construction permit" icon_state = "permit" - desc = "This is a one-use permit that allows the user to offically declare a built room as new addition to the station." + desc = "This is a one-use permit that allows the user to officially declare a built room as new addition to the station." fluffnotice = "Nanotrasen Engineering requires all on-station construction projects to be approved by a head of staff, as detailed in Nanotrasen Company Regulation 512-C (Mid-Shift Modifications to Company Property). \ By submitting this form, you accept any fines, fees, or personal injury/death that may occur during construction." w_class = 1 @@ -258,4 +258,4 @@ if(BORDER_SPACE) return ROOM_ERR_SPACE found+=T - return found \ No newline at end of file + return found From 80f64e73df49cb9f0291e66c37547b6a0cc25eec Mon Sep 17 00:00:00 2001 From: Certh Date: Tue, 24 Nov 2015 16:19:11 +0100 Subject: [PATCH 3/4] Fixed text error when using blueprints --- code/game/objects/items/blueprints.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 62e888a3028..71c6be4d154 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -57,7 +57,7 @@ . = ..() var/area/A = get_area() if(get_area_type() == AREA_STATION) - . += "

According to the [src], you are now in \"[A.name]\".

" + . += "

According to the [src], you are now in \"[sanitize(A.name)]\".

" var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500) popup.set_content(.) popup.open() @@ -83,7 +83,7 @@ . = ..() var/area/A = get_area() if(get_area_type() == AREA_STATION) - . += "

According to the [src], you are now in \"[A.name]\".

" + . += "

According to the [src], you are now in \"[sanitize(A.name)]\".

" . += "

You may move an amendment to the drawing.

" var/datum/browser/popup = new(user, "blueprints", "[src]", 700, 500) popup.set_content(.) @@ -168,7 +168,7 @@ /obj/item/areaeditor/proc/edit_area() var/area/A = get_area() - var/prevname = "[A.name]" + var/prevname = "[sanitize(A.name)]" var/str = trim(stripped_input(usr,"New area name:", "Blueprint Editing", prevname, MAX_NAME_LEN)) if(!str || !length(str) || str==prevname) //cancel return From 180ba0907c224b58b4a8551adcafd64275c590f2 Mon Sep 17 00:00:00 2001 From: Certh Date: Wed, 25 Nov 2015 12:15:41 +0100 Subject: [PATCH 4/4] Fix for harm intent not working on white ui #2590 --- icons/mob/screen1_White.dmi | Bin 146427 -> 146424 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/mob/screen1_White.dmi b/icons/mob/screen1_White.dmi index b474f4434458d1ee00d33068fb7442f12ec14601..2b6e99bbb334e3a031d10c8405e312f7fe3a046b 100644 GIT binary patch delta 1081 zcmV-91jhUO_Xzm+2#_Ry5_(ivbVOxyV{&P5bZKvH004NL&6!P)+DH(F&-hn3$#F>n z9!TcGArYh1NSmy*hn4nZ6?WO(a=Y6pHv_Z3ehn zAAW!QnJ#}kCQnGcb~at4vrm&`w9%zk=_0+$l957PE5G~Fd+?ZlF4Fh!lToRuPZ#Ml z8C3)=?*88c?+CT692Ll-Q24wg*M-25ajtu7g1^=})`qaxy^l2Virgl5Rdt=6jWHu~ zoAdlU8I@?@IbEdF@$Qo)Bf^cg<*}0$6wSfM?0nHzXgm*@BUgd`tqc?mSlxmTG<$Z4 zJ)2K<(I44c$x~c^(O@ay)^p-Eg6#)5|42_^1u^J;qe9Hts3T zfM6AguLL9bh5L=4mM^3PblM6rzCATLZTab2lhc-;X*D@*Bd4zd9V0#pY`91PK3IkT zpF`pG(?G$0j}HaI8FD|)juc#hEpu%zI~dSW3ZM`K3q&D=Gd`mDzAJ>1Z@WS$W4n%E zyb8>v?EYXi`7|H@kAJ5ThGydJL>OrG4MiAOW;YaJV2R&QgrV(qI}v`l`3S%A5ngqu z98XW5l-qS1JWiajr86d9K73oo@PGdO@Yf&T{t=jen3#(JU9ys;tw-x~5WIxEpqF2C zPU%Yru~YU^c5hf|3}nIZ=jB(Dm*ZD5G^YasX>y>J_il2amREa|1GT)|n;fX+_1@$_ zZKU9vymC%(9kAmhp;pcbE(CU5bg&nXnOAa>43k7gz}SW9v;SW8ke zSW7a0GFVFzGFV6EW1a3pw{e3v&?`qjF9~+-Nqg-qKUMZ9U;aJHw_uO*ZP=rHE1XwR zw}#Fur0+2X+h@LFZu=a0ZPAs$dhJ}%Ab%;`5%&F>@FU-@JsK$kuXcPTUP*Z@v7xMu zKp4Aq_+)UV$t06GlF1y&WR7GqM_0%k31yCdgfd4$nWJlDj)d|R$4Qcx$s7q~j;@h8 zlF1y&WR7GqM>3hCD`ZaoDLIj6G1Oc}~1OmA?oTL^{ delta 1084 zcmV-C1jGCI_Xzv<2#_Ry6?#-ybVOxyV{&P5bZKvH004NL&6&@S+By)&&*ZO2+vB4x z1Zeldp%tsAm0tU#cX(1ykx3@86~|7;&cgPu?}1$iEM~?WDuh;Aq|Z#|hdp1%yi32{ z|NZbiU445<9s!-QCS9iU50hlHQKgsZGM#0~NP?=R-+ggjcu1Fj>D#x-s8s0EWjakp z6^a&i|L=h}2+C9z3m{QZ_`F2hg}{-vwtH;?KYJBxgW#0&kw#vk-Q>2auCp^SW{7rk zo?j%R60~?qm+5r8`(()oVWUiW>|`y9=HO#~zUXVvo`&?1t3dzOS`>{isue!a?D-+~ zY%$qIe`IesPq9UR10{p&5uZq`0OJ88T2n}HeoFh5;C#lzW;|@p!xrbU>`?o~cyX{P z1vb;{j`Up$Y-V&qrNHJB9cihYz&4`nJA;pn(wgb~W23YVG-@_jh~q4@fd+m8dwzc6 zC+x{fz{P|P9s9ZttlI4J>#ZO4Nk-Co*IAz~(`h!&vf=K3gS^th$-tv0heyxGtk1x+ zKo`;JlX-r3zEG9Ydbn?c7y@1ON+ASRN@&|u3W44Y7fL$4T+)M&S_|hOrh>J$k8uVl z){*#{F@m4DzvyZCOmaZ03=^ZeIGmLb6B zqVVc*py0=Uhl1e@xf^Fk3ND2yb7d|&7|>A)AVDw|hy)SN_=uwWEBapHt6t=9SK{>v(c|M&m<|Ni;%gJGh7V=e|%NlKP79*oZg<0a%7z5Jqc zN?$sNowAp*d&Tw`yzMw*(FjeSmtRO)j$g>ooDK-2&IPu#cbyAtX|>n6z?PPKoeOMf zz1O+GHd63)URley4%l&=P%CR07XmvjI@pWH%quxg@=_Sav24e2l9$579?f*Fq2}bI zq2{E2q@m_yq@m^{q@j+?$5`b;w{e3v&?`qjEeWRgsJya~-Td+szHtbQl z71qnBTSMz5;MW*~?Gs%wyM2nhw&+ShdhKk{0DURkAvo6~yrMlsRO|99|=H$ds=*j*~o3=8!3K zc#X^A;nL1*ZI?zyf8yxosP}-<#R}XE+n4TWmE;Kn$ zF}evJ+U|Yml|LC?NgvzL!_Pz8@v`A1!^`E0RCq6_9@HYUry88Bz{00J(ulW|kNlb%31cyHa0k=N{0=YN& C`6xI5