From 76a9f12de7f77357043f69a44ebd40f7de37b60f Mon Sep 17 00:00:00 2001 From: Duck- Date: Sat, 9 Aug 2014 13:20:03 -0400 Subject: [PATCH] Gunfixes, improved conversion code. No mutiny. No mutinies at all. Rest in peace. Reduces handgun weightclass back to 3. Pulse rifle firedelay dropped to 8 from 25. Fires comparably to laser cannon. Cult conversion resist added. --- code/game/gamemodes/cult/runes.dm | 30 ++++++++++++++----- .../projectiles/guns/energy/erifles.dm | 2 +- code/modules/projectiles/guns/energy/laser.dm | 7 ++++- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index a9217cd0..9407df1f 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -108,20 +108,36 @@ var/list/sacrificed = list() "\red AAAAAAHHHH!.", \ "\red You hear an anguished scream.") if(is_convertable_to_cult(M.mind) && !jobban_isbanned(M, "cultist"))//putting jobban check here because is_convertable uses mind as argument - ticker.mode.add_cultist(M.mind) - M.mind.special_role = "Cultist" - M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." - M << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." - return 1 + + // Mostly for the benefit of those who resist, but it makes sense for even those who join to have some.. effect. + M.take_overall_damage(0, 10) + + var/choice = alert(M,"Do you want to join the cult?","Submit to Nar'Sie","Resist","Submit") + if(choice == "Submit") + ticker.mode.add_cultist(M.mind) + M.mind.special_role = "Cultist" + M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." + M << "Assist your new compatriots in their dark dealings. Their goal is yours, and yours is theirs. You serve the Dark One above all else. Bring It back." + return 1 + + else if(choice == "Resist") + + M.take_overall_damage(0, rand(5, 10)) // You dirty resister cannot handle the damage to your mind. Easily. + // Resist messages go! + var/BurnLoss = M.getFireLoss() + if (BurnLoss < 25) M << "Your blood boils as you force yourself to resist the corruption invading every corner of your mind." + else if (BurnLoss < 45) M << "Your blood boils and your body burns as the corruption further forces itself into your body and mind." + else if (BurnLoss < 75) M << "You begin to hallucinate images of a dark and incomprehensible being and your entire body feels like its engulfed in flame as your mental defenses crumble." + else if (BurnLoss < 100) M << "Your mind turns to ash as the burning flames engulf your very soul and images of Nar'Sie begin to bombard the last remnants of mental resistance." + else M << "Your entire broken soul and being is engulfed in corruption and flames as your mind shatters away into nothing." + return 0 else M << "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible truth. The veil of reality has been ripped away and in the festering wound left behind something sinister takes root." M << "And you were able to force it out of your mind. You now know the truth, there's something horrible out there, stop it and its minions at all costs." return 0 - return fizzle() - /////////////////////////////////////////FOURTH RUNE tearreality() diff --git a/code/modules/projectiles/guns/energy/erifles.dm b/code/modules/projectiles/guns/energy/erifles.dm index bd3ab86c..bf62b849 100644 --- a/code/modules/projectiles/guns/energy/erifles.dm +++ b/code/modules/projectiles/guns/energy/erifles.dm @@ -199,7 +199,7 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out. w_class = 4 slot_flags = SLOT_BACK //Just realized... Going to need A LOT more on-back sprites now... FECK... var/mode = 2 - fire_delay_wielded = 25 + fire_delay_wielded = 8 fire_delay_unwielded = 75 // attack_self(mob/living/user as mob) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index 3a70a6a1..6d1a5deb 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -16,6 +16,7 @@ desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice." projectile_type = "/obj/item/projectile/beam/practice" clumsy_check = 0 + w_class = 3 isHandgun() return 1 @@ -24,6 +25,7 @@ obj/item/weapon/gun/energy/laser/retro name ="retro laser" icon_state = "retro" desc = "An older model of the basic lasergun, no longer used by Nanotrasen's security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws." + w_class = 3 isHandgun() return 1 @@ -34,6 +36,7 @@ obj/item/weapon/gun/energy/laser/retro force = 10 origin_tech = null var/charge_tick = 0 + w_class = 3 isHandgun() return 1 @@ -104,7 +107,7 @@ obj/item/weapon/gun/energy/laser/retro origin_tech = "combat=5;materials=3;magnets=2;syndicate=2" projectile_type = "/obj/item/projectile/beam/xray" charge_cost = 50 - + w_class = 3 ////////Laser Tag//////////////////// @@ -116,6 +119,7 @@ obj/item/weapon/gun/energy/laser/retro origin_tech = "combat=1;magnets=2" clumsy_check = 0 var/charge_tick = 0 + w_class = 3 special_check(var/mob/living/carbon/human/M) if(ishuman(M)) @@ -153,6 +157,7 @@ obj/item/weapon/gun/energy/laser/retro origin_tech = "combat=1;magnets=2" clumsy_check = 0 var/charge_tick = 0 + w_class = 3 special_check(var/mob/living/carbon/human/M) if(ishuman(M))