From a94d66a1bbafa98446d5c488b4afd88aeae98896 Mon Sep 17 00:00:00 2001 From: Lord Lag Date: Fri, 26 Feb 2016 16:46:59 +0000 Subject: [PATCH 1/8] Borer standard Returns Cortical borer's brain devour, and therefor all zombie abilities. Was removed in new code due to players being awful. --- code/modules/mob/living/simple_animal/borer/borer_powers.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/borer/borer_powers.dm b/code/modules/mob/living/simple_animal/borer/borer_powers.dm index f6b87bfd444..001197d9700 100644 --- a/code/modules/mob/living/simple_animal/borer/borer_powers.dm +++ b/code/modules/mob/living/simple_animal/borer/borer_powers.dm @@ -126,7 +126,7 @@ src << "They are no longer in range!" return -/* + /mob/living/simple_animal/borer/verb/devour_brain() set category = "Abilities" set name = "Devour Brain" @@ -150,7 +150,7 @@ src << "It only takes a few moments to render the dead host brain down into a nutrient-rich slurry..." replace_brain() -*/ + // BRAIN WORM ZOMBIES AAAAH. /mob/living/simple_animal/borer/proc/replace_brain() From 4324d83c7ce1ff05a209549f36bc61f0c4ba41a5 Mon Sep 17 00:00:00 2001 From: Lord Lag Date: Sat, 27 Feb 2016 15:30:03 +0000 Subject: [PATCH 2/8] Revert "Borer standard" This reverts commit a94d66a1bbafa98446d5c488b4afd88aeae98896. --- code/modules/mob/living/simple_animal/borer/borer_powers.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/borer/borer_powers.dm b/code/modules/mob/living/simple_animal/borer/borer_powers.dm index 001197d9700..f6b87bfd444 100644 --- a/code/modules/mob/living/simple_animal/borer/borer_powers.dm +++ b/code/modules/mob/living/simple_animal/borer/borer_powers.dm @@ -126,7 +126,7 @@ src << "They are no longer in range!" return - +/* /mob/living/simple_animal/borer/verb/devour_brain() set category = "Abilities" set name = "Devour Brain" @@ -150,7 +150,7 @@ src << "It only takes a few moments to render the dead host brain down into a nutrient-rich slurry..." replace_brain() - +*/ // BRAIN WORM ZOMBIES AAAAH. /mob/living/simple_animal/borer/proc/replace_brain() From cc9079a69d4143e0f27cc7fec888d114be8cba48 Mon Sep 17 00:00:00 2001 From: Lord Lag Date: Sat, 27 Feb 2016 15:55:52 +0000 Subject: [PATCH 3/8] Return of borers Borers brought up to spec. --- code/game/objects/items/devices/scanners.dm | 6 +++--- code/modules/mob/living/carbon/human/life.dm | 6 +++--- code/modules/mob/living/simple_animal/borer/borer_powers.dm | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index c0275461962..691f56de1b3 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -178,9 +178,9 @@ REAGENT SCANNER user.show_message(text("\red Warning: [D.form] Detected\nName: [D.name].\nType: [D.spread].\nStage: [D.stage]/[D.max_stages].\nPossible Cure: [D.cure]")) // if (M.reagents && M.reagents.get_reagent_amount("inaprovaline")) // user.show_message("\blue Bloodstream Analysis located [M.reagents:get_reagent_amount("inaprovaline")] units of rejuvenation chemicals.") - if (M.has_brain_worms()) - user.show_message("\red Subject suffering from aberrant brain activity. Recommend further scanning.") - else if (M.getBrainLoss() >= 100 || !M.has_brain()) +// if (M.has_brain_worms()) +// user.show_message("\red Subject suffering from aberrant brain activity. Recommend further scanning.") //Cortical borer disable + if (M.getBrainLoss() >= 100 || !M.has_brain()) user.show_message("\red Subject is brain dead.") else if (M.getBrainLoss() >= 60) user.show_message("\red Severe brain damage detected. Subject likely to have mental retardation.") diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 51f6a9a04f9..293be2d0dda 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -1635,13 +1635,13 @@ holder2.icon_state = "hudxeno" else if(foundVirus) holder.icon_state = "hudill" - else if(has_brain_worms()) - var/mob/living/simple_animal/borer/B = has_brain_worms() + /* else if(has_brain_worms()) + var/mob/living/simple_animal/borer/B = has_brain_worms() //Cotrical borer disable if(B.controlling) holder.icon_state = "hudbrainworm" else holder.icon_state = "hudhealthy" - holder2.icon_state = "hudbrainworm" + holder2.icon_state = "hudbrainworm" */ else holder.icon_state = "hudhealthy" if(virus2.len) diff --git a/code/modules/mob/living/simple_animal/borer/borer_powers.dm b/code/modules/mob/living/simple_animal/borer/borer_powers.dm index f6b87bfd444..001197d9700 100644 --- a/code/modules/mob/living/simple_animal/borer/borer_powers.dm +++ b/code/modules/mob/living/simple_animal/borer/borer_powers.dm @@ -126,7 +126,7 @@ src << "They are no longer in range!" return -/* + /mob/living/simple_animal/borer/verb/devour_brain() set category = "Abilities" set name = "Devour Brain" @@ -150,7 +150,7 @@ src << "It only takes a few moments to render the dead host brain down into a nutrient-rich slurry..." replace_brain() -*/ + // BRAIN WORM ZOMBIES AAAAH. /mob/living/simple_animal/borer/proc/replace_brain() From e9c61c5fd90829d9fd667487ce57bbf61c7cb7ac Mon Sep 17 00:00:00 2001 From: Lord Lag Date: Tue, 8 Mar 2016 22:14:59 +0000 Subject: [PATCH 4/8] Adds #183, Vaurca is back to P (not fixed), Slime damage tweaked. --- code/modules/clothing/glasses/glasses.dm | 18 +++++++++++ code/modules/clothing/glasses/hud.dm | 30 ++++++++++++++++++ code/modules/mob/language/station.dm | 2 +- .../modules/mob/living/carbon/metroid/life.dm | 10 +++--- .../mob/living/carbon/metroid/metroid.dm | 2 ++ html/changelogs/[Lord Lag]-[Adds #183].yml | 6 ++++ icons/mob/eyes.dmi | Bin 7356 -> 7700 bytes icons/obj/clothing/glasses.dmi | Bin 7184 -> 7802 bytes 8 files changed, 62 insertions(+), 6 deletions(-) create mode 100644 html/changelogs/[Lord Lag]-[Adds #183].yml diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index c9de540257d..22537d7b183 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -110,6 +110,24 @@ prescription = 1 body_parts_covered = 0 +/obj/item/clothing/glasses/regular/attackby(obj/item/weapon/W as obj, mob/user as mob) + if(istype(W, /obj/item/clothing/glasses/hud/health)) + user.drop_item() + del(W) + user << "You attach a set of medical HUDs to your glasses." + var/turf/T = get_turf(src) + new /obj/item/clothing/glasses/hud/health/prescription(T) + user.drop_from_inventory(src) + del(src) + if(istype(W, /obj/item/clothing/glasses/hud/security)) + user.drop_item() + del(W) + user << "You attach a set of security HUDs to your glasses." + var/turf/T = get_turf(src) + new /obj/item/clothing/glasses/hud/security/prescription(T) + user.drop_from_inventory(src) + del(src) + /obj/item/clothing/glasses/regular/scanners name = "Scanning Goggles" desc = "A very oddly shaped pair of goggles with bits of wire poking out the sides. A soft humming sound emanates from it." diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm index fb3d94ee89d..d775891d287 100644 --- a/code/modules/clothing/glasses/hud.dm +++ b/code/modules/clothing/glasses/hud.dm @@ -20,6 +20,21 @@ /obj/item/clothing/glasses/hud/health/process_hud(var/mob/M) process_med_hud(M, 1) +/obj/item/clothing/glasses/hud/health/prescription + name = "prescription glasses/HUD assembly" + desc = "A medical HUD clipped onto the side of prescription glasses." + prescription = 1 + icon_state = "healthhudpresc" + item_state = "healthhudpresc" + +/obj/item/clothing/glasses/hud/health/prescription/attack_self(mob/user) + user << "You detach a set of medical HUDs form your glasses." + var/turf/T = get_turf(src) + new /obj/item/clothing/glasses/hud/health(T) + new /obj/item/clothing/glasses/regular(T) + user.drop_item(src) + del(src) + /obj/item/clothing/glasses/hud/security name = "Security HUD" desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records." @@ -27,6 +42,21 @@ body_parts_covered = 0 var/global/list/jobs[0] +/obj/item/clothing/glasses/hud/security/prescription + name = "prescription glasses/HUD assembly" + desc = "A security HUD clipped onto the side of prescription glasses." + prescription = 1 + icon_state = "sechudpresc" + item_state = "sechudpresc" + +/obj/item/clothing/glasses/hud/security/prescription/attack_self(mob/user) + user << "You detach a set of security HUDs form your glasses." + var/turf/T = get_turf(src) + new /obj/item/clothing/glasses/hud/health(T) + new /obj/item/clothing/glasses/regular(T) + user.drop_item(src) + del(src) + /obj/item/clothing/glasses/hud/security/jensenshades name = "Augmented shades" desc = "Polarized bioneural eyewear, designed to augment your vision." diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index 13ca46882c8..7aa3d9cd425 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -71,7 +71,7 @@ desc = "Vaurca native language made of clicks and sputters, \"It's a bugs life.\"" speech_verb = "clicks" colour = "vaurca" - key = "m" + key = "p" flags = WHITELISTED syllables = list("kic","klic","\'tic","kit","lit","xic","vil","xrit","tshh","qix","qlit","zix","\'","!") diff --git a/code/modules/mob/living/carbon/metroid/life.dm b/code/modules/mob/living/carbon/metroid/life.dm index 06b4bbae6ca..638137cbd09 100644 --- a/code/modules/mob/living/carbon/metroid/life.dm +++ b/code/modules/mob/living/carbon/metroid/life.dm @@ -52,13 +52,13 @@ //Account for massive pressure differences - if(bodytemperature < (T0C + 5)) // start calculating temperature damage etc + if(bodytemperature < hurt_temperature) // start calculating temperature damage etc - if(bodytemperature <= (T0C - 50)) // hurt temperature - if(bodytemperature <= 50) // sqrting negative numbers is bad + if(bodytemperature <= die_temperature) + if(bodytemperature <= 50) adjustToxLoss(200) else - adjustToxLoss(round(sqrt(bodytemperature)) * 2) + adjustToxLoss(30) updatehealth() @@ -234,7 +234,7 @@ if(issilicon(L) && (rabid || attacked)) // They can't eat silicons, but they can glomp them in defence targets += L // Possible target found! - if(istype(L, /mob/living/carbon/human) && dna) //Ignore slime(wo)men + if(istype(L, /mob/living/carbon/human)) //Ignore slime(wo)men var/mob/living/carbon/human/H = L if(H.species.name == "Slime") continue diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index c2e41118b5a..36ce63cea00 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -48,6 +48,8 @@ var/Atkcool = 0 // attack cooldown var/SStun = 0 // NPC stun variable. Used to calm them down when they are attacked while feeding, or they will immediately re-attach var/Discipline = 0 // if a slime has been hit with a freeze gun, or wrestled/attacked off a human, they become disciplined and don't attack anymore for a while. The part about freeze gun is a lie + var/hurt_temperature = T0C-50 // slime keeps taking damage when its bodytemperature is below this + var/die_temperature = 50 // slime dies instantly when its bodytemperature is below this ///////////TIME FOR SUBSPECIES diff --git a/html/changelogs/[Lord Lag]-[Adds #183].yml b/html/changelogs/[Lord Lag]-[Adds #183].yml new file mode 100644 index 00000000000..d521601d9d1 --- /dev/null +++ b/html/changelogs/[Lord Lag]-[Adds #183].yml @@ -0,0 +1,6 @@ +author: Lord Lag + +delete-after: True + +changes: + - rscadd: "Glasses may once again be combined with HUDs" diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index b68ccd373c51314ec6920588282b4535c70cf643..9c36e5e59c08ec15e2ca0ed8fcef0f633e839411 100644 GIT binary patch literal 7700 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 RS^@zdeO*JHa;--%{sSb9wjKZg literal 7356 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 Jzi#vJzW|c3_JaTb diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index 43bea2af31892939b067442632a05c174a4f7ef1..3e20f69244ee06068e9af0d91266035b4ee506d1 100644 GIT binary patch literal 7802 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 HhuHrGZSLqZ literal 7184 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 Date: Thu, 10 Mar 2016 19:59:52 +0000 Subject: [PATCH 5/8] Fixes #210 --- code/modules/mob/language/monkey.dm | 2 +- code/modules/mob/language/station.dm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/language/monkey.dm b/code/modules/mob/language/monkey.dm index ce276a358ab..f41a484cfce 100644 --- a/code/modules/mob/language/monkey.dm +++ b/code/modules/mob/language/monkey.dm @@ -19,4 +19,4 @@ /datum/language/tajaran/monkey name = "Farwa" desc = "Meow meow meow." - key = "9" + key = "^" diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index 7aa3d9cd425..990d966c227 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -71,7 +71,7 @@ desc = "Vaurca native language made of clicks and sputters, \"It's a bugs life.\"" speech_verb = "clicks" colour = "vaurca" - key = "p" + key = "9" flags = WHITELISTED syllables = list("kic","klic","\'tic","kit","lit","xic","vil","xrit","tshh","qix","qlit","zix","\'","!") From 23ce751ec7377d40a648f8152e8baa2ea0fdb103 Mon Sep 17 00:00:00 2001 From: Lord Lag Date: Thu, 10 Mar 2016 20:01:20 +0000 Subject: [PATCH 6/8] Update [Lord Lag]-[Adds #183].yml --- html/changelogs/[Lord Lag]-[Adds #183].yml | 1 + 1 file changed, 1 insertion(+) diff --git a/html/changelogs/[Lord Lag]-[Adds #183].yml b/html/changelogs/[Lord Lag]-[Adds #183].yml index d521601d9d1..880a41ea0ad 100644 --- a/html/changelogs/[Lord Lag]-[Adds #183].yml +++ b/html/changelogs/[Lord Lag]-[Adds #183].yml @@ -4,3 +4,4 @@ delete-after: True changes: - rscadd: "Glasses may once again be combined with HUDs" + - bugfix: ":9 is the new new Vaurcese hotkey." From 760c6895d2194869dec8104cdfa011a82b771d2b Mon Sep 17 00:00:00 2001 From: Lord Lag Date: Sat, 19 Mar 2016 15:26:48 +0000 Subject: [PATCH 7/8] Update [Lord Lag]-[Adds #183].yml --- html/changelogs/[Lord Lag]-[Adds #183].yml | 1 + 1 file changed, 1 insertion(+) diff --git a/html/changelogs/[Lord Lag]-[Adds #183].yml b/html/changelogs/[Lord Lag]-[Adds #183].yml index 880a41ea0ad..7b85cc94043 100644 --- a/html/changelogs/[Lord Lag]-[Adds #183].yml +++ b/html/changelogs/[Lord Lag]-[Adds #183].yml @@ -4,4 +4,5 @@ delete-after: True changes: - rscadd: "Glasses may once again be combined with HUDs" + - rscadd: "Borers have a full compliment of abilities once more." - bugfix: ":9 is the new new Vaurcese hotkey." From b294a52dcc564dc9aa38d9d55c4d4d297700bf89 Mon Sep 17 00:00:00 2001 From: Lord Lag Date: Sun, 20 Mar 2016 14:50:19 +0000 Subject: [PATCH 8/8] Fixes 120 replaces the temperature gun with the old-fashioned Freeze ray. --- .../projectiles/guns/energy/temperature.dm | 19 ++++++++++--------- .../modules/projectiles/projectile/special.dm | 6 +++--- html/changelogs/[Lord Lag]-[Fixes #120].yml | 7 +++++++ 3 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 html/changelogs/[Lord Lag]-[Fixes #120].yml diff --git a/code/modules/projectiles/guns/energy/temperature.dm b/code/modules/projectiles/guns/energy/temperature.dm index 47bc2cfc00b..34801b4574b 100644 --- a/code/modules/projectiles/guns/energy/temperature.dm +++ b/code/modules/projectiles/guns/energy/temperature.dm @@ -1,18 +1,18 @@ /obj/item/weapon/gun/energy/temperature - name = "temperature gun" + name = "freeze ray" icon_state = "freezegun" fire_sound = 'sound/weapons/pulse3.ogg' - desc = "A gun that changes temperatures. It has a small label on the side, 'More extreme temperatures will cost more charge!'" - var/temperature = T20C - var/current_temperature = T20C - charge_cost = 100 + desc = "For when somebody won't let it go." + //var/temperature = T20C + //var/current_temperature = T20C + charge_cost = 25 //20 shots, exact replica of old code (WAS 100) origin_tech = "combat=3;materials=4;powerstorage=3;magnets=2" slot_flags = SLOT_BELT|SLOT_BACK projectile_type = /obj/item/projectile/temp - cell_type = /obj/item/weapon/cell/high - + cell_type = /obj/item/weapon/cell/crap //WAS High, but brought down to match energy use +/* /obj/item/weapon/gun/energy/temperature/New() ..() processing_objects.Add(src) @@ -38,7 +38,7 @@ user << browse(dat, "window=freezegun;size=450x300;can_resize=1;can_close=1;can_minimize=1") onclose(user, "window=freezegun", src) - +*/ /obj/item/weapon/gun/energy/temperature/Topic(href, href_list) if (..()) @@ -47,7 +47,7 @@ src.add_fingerprint(usr) - +/* if(href_list["temp"]) var/amount = text2num(href_list["temp"]) if(amount > 0) @@ -77,3 +77,4 @@ temperature += 10 else temperature = current_temperature +*/ \ No newline at end of file diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index f2578d3f60b..bfba9472313 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -28,7 +28,7 @@ name ="high-ex round" icon_state= "bolter" damage = 15 - + on_hit(var/atom/target, var/blocked = 0) explosion(target, -1, 0, 2) sleep(0) @@ -44,13 +44,13 @@ damage_type = BURN nodamage = 1 check_armour = "energy" - var/temperature = 300 + //var/temperature = 300 on_hit(var/atom/target, var/blocked = 0)//These two could likely check temp protection on the mob if(istype(target, /mob/living)) var/mob/M = target - M.bodytemperature = temperature + M.bodytemperature = -273 return 1 /obj/item/projectile/meteor diff --git a/html/changelogs/[Lord Lag]-[Fixes #120].yml b/html/changelogs/[Lord Lag]-[Fixes #120].yml new file mode 100644 index 00000000000..f14cc1ab746 --- /dev/null +++ b/html/changelogs/[Lord Lag]-[Fixes #120].yml @@ -0,0 +1,7 @@ +author: Lord Lag + +delete-after: True + +changes: + - tweak: "The broken Temperature gun has been replaced with the Freeze ray" +