From 462f428d5ce8bcca96a758b5a771148417161490 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Thu, 11 May 2017 10:41:47 -0300 Subject: [PATCH 1/4] Fix package wrapper not copying the original item size (#2197) This will stop all dirty powergamers from using this to stuff shit they should be able to into bags. --- code/modules/recycling/sortingmachinery.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index c729c53bb4b..1995cbae7ab 100755 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -248,6 +248,7 @@ user.client.screen -= O P.wrapped = O O.forceMove(P) + P.w_class = O.w_class var/i = round(O.w_class) if(i in list(1,2,3,4,5)) P.icon_state = "deliverycrate[i]" From 2e2a92b39a4cfa5d04667658c539412e67c5ee20 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sun, 14 May 2017 07:22:02 -0300 Subject: [PATCH 2/4] Fix airlock related hallucination affecting ipcs and dionae (#2261) This may fix dionae and ipcs touching airlocks while suffering from sm's hallucination, SOMEHOW, and being "shocked" by them. --- code/game/machinery/doors/airlock.dm | 2 +- code/modules/supermatter/supermatter.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 0feb612370c..a08ac0d0916 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -414,7 +414,7 @@ About the new airlock wires panel: return else /*if(src.justzap)*/ return - else if(user.hallucination > 50 && prob(10) && src.operating == 0) + else if(user.hallucination > 50 && prob(10) && src.operating == 0 && !user.is_diona() && !user.isSynthetic()) user << "You feel a powerful shock course through your body!" user.halloss += 10 user.stunned += 10 diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index bf08fa1d8c3..1b910194b13 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -263,7 +263,7 @@ env.merge(removed) for(var/mob/living/carbon/human/l in view(src, min(7, round(sqrt(power/6))))) // If they can see it without mesons on. Bad on them. - if(!istype(l.glasses, /obj/item/clothing/glasses/meson) && !l.is_diona()) + if(!istype(l.glasses, /obj/item/clothing/glasses/meson) && !l.is_diona() && !l.isSynthetic()) l.hallucination = max(0, min(200, l.hallucination + power * config_hallucination_power * sqrt( 1 / max(1,get_dist(l, src)) ) ) ) //adjusted range so that a power of 170 (pretty high) results in 9 tiles, roughly the distance from the core to the engine monitoring room. From 9543d5628b2608271ffeb5e06de75739e7d59c93 Mon Sep 17 00:00:00 2001 From: Ron Date: Sun, 14 May 2017 06:34:10 -0400 Subject: [PATCH 3/4] Bug fixes (#2109, #1437, and AI Slipper) (#2227) Fixes #2109 Fixes #1437 --- code/game/machinery/ai_slipper.dm | 1 - code/modules/cciaa/cciaa.dm | 5 +++++ code/modules/mob/living/carbon/metroid/items.dm | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 9d45b14414e..6dd1c462769 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -8,7 +8,6 @@ idle_power_usage = 10 var/uses = 20 var/disabled = 1 - var/lethal = 0 var/locked = 1 var/cooldown_time = 0 var/cooldown_timeleft = 0 diff --git a/code/modules/cciaa/cciaa.dm b/code/modules/cciaa/cciaa.dm index 1767933b35d..e6613e6053b 100644 --- a/code/modules/cciaa/cciaa.dm +++ b/code/modules/cciaa/cciaa.dm @@ -231,6 +231,9 @@ if (!customname) usr << "Cancelled." return + var/announce = alert(user, "Do you wish to announce the fax being sent?", "Announce Fax", "Yes", "No") + if(announce == "Yes") + announce = 1 // Create the reply message var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( null ) //hopefully the null loc won't cause trouble for us @@ -248,6 +251,8 @@ P.stamps += "
This paper has been stamped by the Central Command Quantum Relay." if(fax.recievefax(P)) + if(announce == 1) + command_announcement.Announce("A fax has been sent to the [department] fax machine.", "Fax Sent") usr << "Message transmitted successfully." log_and_message_admins("sent a fax message to the [department] fax machine. (JMP)") diff --git a/code/modules/mob/living/carbon/metroid/items.dm b/code/modules/mob/living/carbon/metroid/items.dm index 626b011f6f1..001cb5c890c 100644 --- a/code/modules/mob/living/carbon/metroid/items.dm +++ b/code/modules/mob/living/carbon/metroid/items.dm @@ -250,7 +250,7 @@ if(O.mind && O.mind.current && O.mind.current.stat != DEAD) continue ghost = O break - if(ghost) + if(ghost && !(ghost.has_enabled_antagHUD && config.antag_hud_restricted)) icon_state = "golem2" else icon_state = "golem" @@ -265,6 +265,10 @@ if(!ghost) user << "The rune fizzles uselessly. There is no spirit nearby." return + if(ghost.has_enabled_antagHUD && config.antag_hud_restricted) + ghost <<"You can not join as a golem with antagHUD on!" + user << "The rune fizzles uselessly. There is no spirit nearby." + return var/mob/living/carbon/human/G = new(src.loc) G.set_species("Golem") G.key = ghost.key From 9bdd1c81b72237a88dccabff215ca2c483539e08 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sun, 14 May 2017 14:39:30 -0300 Subject: [PATCH 4/4] Custom Items 14/05 (#2266) Adds the following items: -Null Staff - Kesaos Azaroz - paradoxspace --- code/modules/customitems/item_defines.dm | 13 ++++++++++++- icons/obj/custom_items/azaroz_staff.dmi | Bin 0 -> 1069 bytes 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 icons/obj/custom_items/azaroz_staff.dmi diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 222a4d7f77e..6f96654a789 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -850,7 +850,7 @@ All custom items with worn sprites must follow the contained sprite system: http /obj/item/clothing/head/beret/engineering/fluff/ikrad_beret //LR-31MTA Beret - Ikrad Yam'hir - houseofsynth - name = "LR-31MTA beret" + name = "\improper LR-31MTA beret" desc = "A silver beret with an insignia on the front, it looks like an old Tajaran cannon with a ring around it. \ Along the top half of the ring \"LR-31MTA\" is engraved. The word \"Yam'hir\" is engraved along the bottom half of the ring. \ The beret looks old and is worn in some places around the edges. It appears to have a flap inside, \ @@ -1027,3 +1027,14 @@ All custom items with worn sprites must follow the contained sprite system: http icon_state = "leo_coat" item_state = "leo_coat" contained_sprite = 1 + + +/obj/item/weapon/nullrod/fluff/azaroz_staff //Null Staff - Kesaos Azaroz - paradoxspace + name = "null staff" + desc = "A long, heavy staff seemingly hand-crafted of obsidian and steel. Pure volcanic crystals lie at its end, giving it an appearance similar to a mace." + icon = 'icons/obj/custom_items/azaroz_staff.dmi' + icon_state = "azaroz_staff" + item_state = "azaroz_staff" + contained_sprite = 1 + slot_flags = SLOT_BACK + w_class = 4 diff --git a/icons/obj/custom_items/azaroz_staff.dmi b/icons/obj/custom_items/azaroz_staff.dmi new file mode 100644 index 0000000000000000000000000000000000000000..525a92af09512daae4dfab2a980a8e2e85eae3ed GIT binary patch literal 1069 zcmV+|1k(G7P)`BiQ{v)G$t)@c3LA29rWGaTrb5_Q702gfAk>=>p}vSj z^+}1i)GI5v`niC83jh`ANu)0fb?pEE12#!SK~!jg?N~jJ+b|4uR6BEEIGt@@vKJjX zD+b#6VxW5txb*-3gf`d2dZb8EX9o>X+?!~bex#m0D61$QicOA7!l`S`?_FCwsa~t$ znYDa=;Vy^gVmzqqHP7z+BXVhruGa|4Jxgxge2ZMZ6x&A4V8Z zm*g^P1e|$&UW+b&MncA(CvcKoDutkA?d$KF3)kujPW;LxnOu0PR}3tHv+Ckx0w%7Y zz|BP=XlVkm0+C8d0zm;#NqEU1DF7-daE(X!zQND7dN zVu&CrKqg9B1X%$x3!G0TAoh@~m81x=0&D^^5lBMkQw9MOfg~g+!0AX#x=J$Y6Bj|- zq*5Rv44PL0z50-e6+UG3`riUlTIpWwE!urxQ0vg!%dhY~DmjL6sd#}!G%z7|I61p6 z1nCkf^mVXnu#0V&CZ9&H6C94g9>6Y2=-ZIW0LY(6AlQ9U^L($^RC|4%q8A%246B|< z$dcrH6f8F9HG)C0FMuBD``@V8Jgiy-+F(YN8^fwa06vPx3K}pQ4e_A^31ktfGyy^u z;T;>HEP_5i@?e~pY?!s61X~h;NZ zLRB(Xd1i&R!6QTw<<;4X<^^$K^b!H=4=h5({jI+`9w8RZ`n6>dVgmEmmPUvP(zW&y zfqW8gX(oa5=?rX;PDZ1UfgZn^lK~lrIRs=JW)YwWv(6gMFU$Z%m@^7QgjpG&2r>cR zWjLG