From 15700e153016a1aa8d476a98709796f0ff2747e1 Mon Sep 17 00:00:00 2001 From: palpatine213 Date: Mon, 1 Jun 2015 16:15:10 -0700 Subject: [PATCH 1/6] Changes Hud emagging from EMP to Emag --- code/modules/clothing/glasses/hud.dm | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 6cbd4620382..478713f49c6 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -15,10 +15,15 @@ var/datum/atom_hud/H = huds[hud_type] H.remove_hud_from(user) -/obj/item/clothing/glasses/hud/emp_act(severity) - if(emagged == 0) - emagged = 1 - desc = desc + " The display flickers slightly." +/obj/item/clothing/glasses/hud/attackby(obj/item/weapon/W as obj, mob/user as mob) + ..() + if(istype(W, /obj/item/weapon/card/emag)) + if(emagged == 0) + emagged = 1 + user << "PZZTTPFFFT" + desc = desc + " The display flickers slightly." + else + user << "It is already emagged!" /obj/item/clothing/glasses/hud/health name = "Health Scanner HUD" @@ -60,10 +65,15 @@ darkness_view = 8 invis_view = SEE_INVISIBLE_MINIMUM -/obj/item/clothing/glasses/hud/security/sunglasses/emp_act(severity) - if(emagged == 0) - emagged = 1 - desc = desc + " The display flickers slightly." +/obj/item/clothing/glasses/hud/security/sunglasses/attackby(obj/item/weapon/W as obj, mob/user as mob) + ..() + if(istype(W, /obj/item/weapon/card/emag)) + if(emagged == 0) + emagged = 1 + user << "PZZTTPFFFT" + desc = desc + " The display flickers slightly." + else + user << "It is already emagged!" /obj/item/clothing/glasses/hud/security/sunglasses/gars name = "HUD gar glasses" From a9d245ceb6fa605cd089aeab7c59e05fee72c3ed Mon Sep 17 00:00:00 2001 From: palpatine213 Date: Mon, 1 Jun 2015 16:15:49 -0700 Subject: [PATCH 2/6] Adds self to Admins.txt --- config/admins.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/config/admins.txt b/config/admins.txt index 81c120f06e7..5a30ad7de5c 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -83,3 +83,4 @@ vekter = Game Master Ahammer18 = Game Master ACCount12 = Game Master fayrik = Game Master +shadowlight213 = Game Master \ No newline at end of file From bdae17eba085dbcdd47eb305b8da4caaaa2a1797 Mon Sep 17 00:00:00 2001 From: palpatine213 Date: Mon, 1 Jun 2015 16:34:52 -0700 Subject: [PATCH 3/6] Changelog --- html/changelogs/palpatine213-hudemag.yml | 37 ++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 html/changelogs/palpatine213-hudemag.yml diff --git a/html/changelogs/palpatine213-hudemag.yml b/html/changelogs/palpatine213-hudemag.yml new file mode 100644 index 00000000000..9bd16e116e2 --- /dev/null +++ b/html/changelogs/palpatine213-hudemag.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# spellcheck (typo fixes) +# experiment +# tgs (TG-ported fixes?) +################################# + +# Your name. +author: Palpatine213 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "Changed Sechud emagging from being triggered by EMPs, to being triggered by an emag." + From d1ff29c278818b63f1cb5ea2d39e992032a2ea55 Mon Sep 17 00:00:00 2001 From: palpatine213 Date: Mon, 1 Jun 2015 18:19:07 -0700 Subject: [PATCH 4/6] Let's both emags and EMPs affect huds --- code/modules/clothing/glasses/hud.dm | 17 +++++++++++++---- html/changelogs/palpatine213-hudemag.yml | 2 +- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 478713f49c6..55b9f4715c3 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -15,6 +15,11 @@ var/datum/atom_hud/H = huds[hud_type] H.remove_hud_from(user) +/obj/item/clothing/glasses/hud/emp_act(severity) + if(emagged == 0) + emagged = 1 + desc = desc + " The display flickers slightly." + /obj/item/clothing/glasses/hud/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if(istype(W, /obj/item/weapon/card/emag)) @@ -22,8 +27,8 @@ emagged = 1 user << "PZZTTPFFFT" desc = desc + " The display flickers slightly." - else - user << "It is already emagged!" + + /obj/item/clothing/glasses/hud/health name = "Health Scanner HUD" @@ -65,6 +70,11 @@ darkness_view = 8 invis_view = SEE_INVISIBLE_MINIMUM +/obj/item/clothing/glasses/hud/security/sunglasses/emp_act(severity) + if(emagged == 0) + emagged = 1 + desc = desc + " The display flickers slightly." + /obj/item/clothing/glasses/hud/security/sunglasses/attackby(obj/item/weapon/W as obj, mob/user as mob) ..() if(istype(W, /obj/item/weapon/card/emag)) @@ -72,8 +82,7 @@ emagged = 1 user << "PZZTTPFFFT" desc = desc + " The display flickers slightly." - else - user << "It is already emagged!" + /obj/item/clothing/glasses/hud/security/sunglasses/gars name = "HUD gar glasses" diff --git a/html/changelogs/palpatine213-hudemag.yml b/html/changelogs/palpatine213-hudemag.yml index 9bd16e116e2..cd2b300bb20 100644 --- a/html/changelogs/palpatine213-hudemag.yml +++ b/html/changelogs/palpatine213-hudemag.yml @@ -33,5 +33,5 @@ delete-after: True # Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. # Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. changes: - - tweak: "Changed Sechud emagging from being triggered by EMPs, to being triggered by an emag." + - tweak: "Allows sechuds to have their id locks removed via emag as well as EMP" From 631a0e188418459a34db90e607d139581d36f667 Mon Sep 17 00:00:00 2001 From: palpatine213 Date: Tue, 2 Jun 2015 17:29:05 -0700 Subject: [PATCH 5/6] Changes to use emag_act() --- code/modules/clothing/glasses/hud.dm | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 55b9f4715c3..2eee64cad7b 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -20,13 +20,11 @@ emagged = 1 desc = desc + " The display flickers slightly." -/obj/item/clothing/glasses/hud/attackby(obj/item/weapon/W as obj, mob/user as mob) - ..() - if(istype(W, /obj/item/weapon/card/emag)) - if(emagged == 0) - emagged = 1 - user << "PZZTTPFFFT" - desc = desc + " The display flickers slightly." +/obj/item/clothing/glasses/hud/emag_act(mob/user) + if(emagged == 0) + emagged = 1 + user << "PZZTTPFFFT" + desc = desc + " The display flickers slightly." @@ -75,13 +73,11 @@ emagged = 1 desc = desc + " The display flickers slightly." -/obj/item/clothing/glasses/hud/security/sunglasses/attackby(obj/item/weapon/W as obj, mob/user as mob) - ..() - if(istype(W, /obj/item/weapon/card/emag)) - if(emagged == 0) - emagged = 1 - user << "PZZTTPFFFT" - desc = desc + " The display flickers slightly." +/obj/item/clothing/glasses/hud/security/sunglasses/emag_act(mob/user) + if(emagged == 0) + emagged = 1 + user << "PZZTTPFFFT" + desc = desc + " The display flickers slightly." /obj/item/clothing/glasses/hud/security/sunglasses/gars From cb9f124ff1cd048b2970dd65570500a746e14fec Mon Sep 17 00:00:00 2001 From: palpatine213 Date: Thu, 4 Jun 2015 13:20:15 -0700 Subject: [PATCH 6/6] Removed redundant code. --- code/modules/clothing/glasses/hud.dm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index 2eee64cad7b..0f7365a3417 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -26,8 +26,6 @@ user << "PZZTTPFFFT" desc = desc + " The display flickers slightly." - - /obj/item/clothing/glasses/hud/health name = "Health Scanner HUD" desc = "A heads-up display that scans the humans in view and provides accurate data about their health status." @@ -68,18 +66,6 @@ darkness_view = 8 invis_view = SEE_INVISIBLE_MINIMUM -/obj/item/clothing/glasses/hud/security/sunglasses/emp_act(severity) - if(emagged == 0) - emagged = 1 - desc = desc + " The display flickers slightly." - -/obj/item/clothing/glasses/hud/security/sunglasses/emag_act(mob/user) - if(emagged == 0) - emagged = 1 - user << "PZZTTPFFFT" - desc = desc + " The display flickers slightly." - - /obj/item/clothing/glasses/hud/security/sunglasses/gars name = "HUD gar glasses" desc = "GAR glasses with a HUD."