diff --git a/code/game/gamemodes/blob/theblob.dm b/code/game/gamemodes/blob/theblob.dm index c93fee1c216..0b5dfbb4e7c 100644 --- a/code/game/gamemodes/blob/theblob.dm +++ b/code/game/gamemodes/blob/theblob.dm @@ -104,6 +104,9 @@ if (flag == PROJECTILE_BULLET) health -= 10 update() + if (flag == PROJECTILE_BULLETBURST) + health -= 4 + update() else if (flag == PROJECTILE_BOLT) poisoned(1) else diff --git a/code/game/gamemodes/events/ninja_equipment.dm b/code/game/gamemodes/events/ninja_equipment.dm index f8175f98c01..438d8c58126 100644 --- a/code/game/gamemodes/events/ninja_equipment.dm +++ b/code/game/gamemodes/events/ninja_equipment.dm @@ -1384,6 +1384,8 @@ It is possible to destroy the net by the occupant or someone else. switch(flag) if (PROJECTILE_BULLET) health -= 35 + if (PROJECTILE_BULLETBURST) + health -= 13 if (PROJECTILE_PULSE) health -= 50 if (PROJECTILE_LASER) diff --git a/code/game/machinery/bots/bots.dm b/code/game/machinery/bots/bots.dm index 46b31cf1c6e..69bd4780dd2 100644 --- a/code/game/machinery/bots/bots.dm +++ b/code/game/machinery/bots/bots.dm @@ -77,6 +77,8 @@ switch(flag) if (PROJECTILE_BULLET) src.health -= 20 + if (PROJECTILE_BULLETBURST) + src.health -= 8 //if (PROJECTILE_WEAKBULLET || PROJECTILE_BEANBAG) //Detective's revolver fires marshmallows // src.health -= 2 if (PROJECTILE_LASER) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index fdc1ea6fef4..208f8d78794 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -236,6 +236,8 @@ Neutralize All Unidentified Life Signs: []
"}, // handles how much damage each type of projectile deals if (flag == PROJECTILE_BULLET) src.health -= 5 + else if (flag == PROJECTILE_BULLETBURST) + src.health -= 2 else if (flag == PROJECTILE_TASER) src.health -= 1 else if(flag == PROJECTILE_PULSE) diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 7abfdb39503..c5fc356f757 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -381,8 +381,14 @@ switch(flag) if (PROJECTILE_BULLET) src.storedpower -= 10 + if (PROJECTILE_BULLETBURST) + src.storedpower -= 4 if (PROJECTILE_WEAKBULLET) src.storedpower -= 1 + if (PROJECTILE_WEAKBULLETBURST) + src.storedpower -= 1 + if (PROJECTILE_WEAKERBULLETBURST) + src.storedpower -= 0.5 if (PROJECTILE_LASER) src.storedpower +=20 if (PROJECTILE_SHOCK) @@ -511,8 +517,14 @@ switch(flag) if (PROJECTILE_BULLET) G.storedpower -= 10 + if (PROJECTILE_BULLETBURST) + G.storedpower -= 4 if (PROJECTILE_WEAKBULLET) G.storedpower -=1 + if (PROJECTILE_WEAKBULLETBURST) + G.storedpower -=1 + if (PROJECTILE_WEAKERBULLETBURST) + G.storedpower -=0.5 if (PROJECTILE_LASER) G.storedpower +=20 if (PROJECTILE_SHOCK) diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm index 3b3c85fae43..5a5cff4a425 100644 --- a/code/game/machinery/turrets.dm +++ b/code/game/machinery/turrets.dm @@ -231,6 +231,8 @@ /obj/machinery/turret/bullet_act(flag) if (flag == PROJECTILE_BULLET) src.health -= 17 + else if (flag == PROJECTILE_BULLETBURST) + src.health -= 7 else if (flag == PROJECTILE_TASER) //taser src.health -= 1 else if(flag == PROJECTILE_PULSE) @@ -444,8 +446,14 @@ damage = 8 if(PROJECTILE_WEAKBULLET) damage = 8 + if(PROJECTILE_WEAKBULLETBURST) + damage = 4 + if(PROJECTILE_WEAKERBULLETBURST) + damage = 2 if(PROJECTILE_BULLET) damage = 10 + if(PROJECTILE_BULLETBURST) + damage = 4 if(PROJECTILE_BOLT) damage = 5 if(PROJECTILE_DART) diff --git a/code/game/magic/magicmonster.dm b/code/game/magic/magicmonster.dm index ce3cb24ef15..3552ac53884 100644 --- a/code/game/magic/magicmonster.dm +++ b/code/game/magic/magicmonster.dm @@ -78,8 +78,14 @@ bullet_act(flag, A as obj) if (flag == PROJECTILE_BULLET) src.health -= 20 + else if (flag == PROJECTILE_BULLETBURST) + src.health -= 8 else if (flag == PROJECTILE_WEAKBULLET) src.health -= 4 + else if (flag == PROJECTILE_WEAKBULLETBURST) + src.health -= 2 + else if (flag == PROJECTILE_WEAKERBULLETBURST) + src.health -= 1 else if (flag == PROJECTILE_LASER) src.health -= 10 else if (flag == PROJECTILE_SHOCK) diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index d4c98beca95..f366e83d8dc 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -484,8 +484,14 @@ damage = 25 if(PROJECTILE_WEAKBULLET) damage = 8 + if(PROJECTILE_WEAKBULLETBURST) + damage = 4 + if(PROJECTILE_WEAKERBULLETBURST) + damage = 2 if(PROJECTILE_BULLET) damage = 10 + if(PROJECTILE_BULLETBURST) + damage = 4 if(PROJECTILE_BOLT) damage = 5 if(PROJECTILE_DART) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index fe8a82d335e..ce5372c5a18 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -409,8 +409,14 @@ use_power(500) if(PROJECTILE_WEAKBULLET) damage = 8 + if(PROJECTILE_WEAKBULLETBURST) + damage = 4 + if(PROJECTILE_WEAKERBULLETBURST) + damage = 2 if(PROJECTILE_BULLET) damage = 10 + if(PROJECTILE_BULLETBURST) + damage = 4 if(PROJECTILE_BOLT) damage = 5 if(PROJECTILE_DART) diff --git a/code/game/objects/alien/egg.dm b/code/game/objects/alien/egg.dm index 2fa9974970d..0fceab2eb9b 100644 --- a/code/game/objects/alien/egg.dm +++ b/code/game/objects/alien/egg.dm @@ -16,6 +16,14 @@ switch(flag) if (PROJECTILE_BULLET) health -= 35 + if (PROJECTILE_BULLETBURST) + health -= 13 + if (PROJECTILE_WEAKBULLET) + health -= 12 + if (PROJECTILE_WEAKBULLETBURST) + health -= 6 + if (PROJECTILE_WEAKERBULLETBURST) + health -= 3 if (PROJECTILE_PULSE) health -= 50 if (PROJECTILE_LASER) diff --git a/code/game/objects/alien/facehugger.dm b/code/game/objects/alien/facehugger.dm index 102ddfa296e..50cbff8a789 100644 --- a/code/game/objects/alien/facehugger.dm +++ b/code/game/objects/alien/facehugger.dm @@ -89,8 +89,14 @@ switch(flag) if (PROJECTILE_BULLET) health -= 20 + if (PROJECTILE_BULLETBURST) + health -= 7 if (PROJECTILE_WEAKBULLET) health -= 4 + if (PROJECTILE_WEAKBULLETBURST) + health -= 2 + if (PROJECTILE_WEAKERBULLETBURST) + health -= 1 if (PROJECTILE_LASER) health -= 10 if (PROJECTILE_SHOCK) diff --git a/code/game/objects/alien/resin.dm b/code/game/objects/alien/resin.dm index 9018c176c6e..58a9e3203bc 100644 --- a/code/game/objects/alien/resin.dm +++ b/code/game/objects/alien/resin.dm @@ -21,6 +21,8 @@ switch(flag) if (PROJECTILE_BULLET) health -= 35 + if (PROJECTILE_BULLETBURST) + health -= 13 if (PROJECTILE_PULSE) health -= 50 if (PROJECTILE_LASER) diff --git a/code/game/objects/displaycase.dm b/code/game/objects/displaycase.dm index 7ddf5913bc1..fb9d60954fc 100644 --- a/code/game/objects/displaycase.dm +++ b/code/game/objects/displaycase.dm @@ -21,6 +21,10 @@ src.health -= 10 src.healthcheck() return + if (flag == PROJECTILE_BULLETBURST) + src.health -= 4 + src.healthcheck() + return if (flag != PROJECTILE_LASER) //lasers aren't particularly good at breaking glass src.health -= 2 src.healthcheck() diff --git a/code/game/objects/items/weapons/guns_new.dm b/code/game/objects/items/weapons/guns_new.dm index a199e2ba1a8..34268256210 100644 --- a/code/game/objects/items/weapons/guns_new.dm +++ b/code/game/objects/items/weapons/guns_new.dm @@ -7,6 +7,9 @@ var/const/PROJECTILE_WEAKBULLET = 6 var/const/PROJECTILE_TELEGUN = 7 var/const/PROJECTILE_DART = 8 var/const/PROJECTILE_SHOCK = 9 +var/const/PROJECTILE_BULLETBURST = 10 +var/const/PROJECTILE_WEAKBULLETBURST = 11 +var/const/PROJECTILE_WEAKERBULLETBURST = 12 /////////////////////////////////////////////// ////////////////AMMO SECTION/////////////////// @@ -33,10 +36,18 @@ var/const/PROJECTILE_SHOCK = 9 bumped = 0 - weakbullet damage_type = PROJECTILE_WEAKBULLET + bulletburst + damage_type = PROJECTILE_BULLETBURST + + weakbulletburst + damage_type = PROJECTILE_WEAKBULLETBURST + + weakerbulletburst + damage_type = PROJECTILE_WEAKERBULLETBURST + beam name = "laser" damage_type = PROJECTILE_LASER diff --git a/code/game/objects/lamarr.dm b/code/game/objects/lamarr.dm index 9dedf6bb3d9..fdbf720fd57 100644 --- a/code/game/objects/lamarr.dm +++ b/code/game/objects/lamarr.dm @@ -35,6 +35,10 @@ src.health -= 10 src.healthcheck() return + if (flag == PROJECTILE_BULLETBURST) + src.health -= 4 + src.healthcheck() + return if (flag != PROJECTILE_LASER) //lasers aren't particularly good at breaking glass src.health -= 2 src.healthcheck() diff --git a/code/game/objects/livestock.dm b/code/game/objects/livestock.dm index 09a9e0d200a..8c3de927b4e 100644 --- a/code/game/objects/livestock.dm +++ b/code/game/objects/livestock.dm @@ -136,12 +136,18 @@ switch(flag) if(PROJECTILE_BULLET) src.health -= 15 + if(PROJECTILE_BULLETBURST) + src.health -= 6 if(PROJECTILE_TASER) src.health -= 5 if(PROJECTILE_DART) src.health -= 10 if(PROJECTILE_WEAKBULLET) src.health -= 8 + if(PROJECTILE_WEAKBULLETBURST) + src.health -= 4 + if(PROJECTILE_WEAKERBULLETBURST) + src.health -= 2 if(PROJECTILE_LASER) src.health -= 10 if(PROJECTILE_SHOCK) diff --git a/code/game/objects/window.dm b/code/game/objects/window.dm index c4b918f740b..2e8b3693128 100644 --- a/code/game/objects/window.dm +++ b/code/game/objects/window.dm @@ -14,6 +14,22 @@ src.density = 0 del(src) + return + if (flag == PROJECTILE_BULLETBURST) + if(!reinf) + new /obj/item/weapon/shard( src.loc ) + //SN src = null + src.density = 0 + + del(src) + else + health -= 13 + if(health <=0) + new /obj/item/weapon/shard( src.loc ) + new /obj/item/stack/rods( src.loc ) + src.density = 0 + del(src) + return return diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index 48cda2c85c7..cc00367d262 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -121,6 +121,27 @@ updatehealth() if (prob(50)&&weakened <= 5) weakened = 5 + if(PROJECTILE_WEAKBULLET) + var/d = 14 + if (stat != 2) + bruteloss += d + updatehealth() + if (prob(50)&&weakened <= 2) + weakened = 2 + if(PROJECTILE_WEAKBULLETBURST) + var/d = 7 + if (stat != 2) + bruteloss += d + updatehealth() + if (prob(50)&&weakened <= 2) + weakened = 2 + if(PROJECTILE_BULLETBURST) + var/d = 18 + if (stat != 2) + bruteloss += d + updatehealth() + if (prob(50)&&weakened <= 2) + weakened = 2 if(PROJECTILE_TASER) if (prob(75) && stunned <= 10) stunned = 10 diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index 7a5d5ae42de..9e026d7cc07 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -99,6 +99,36 @@ if (prob(50)) if(weakened <= 5) weakened = 5 return + if(PROJECTILE_WEAKBULLET) + var/d = 14 + + if (stat != 2) + bruteloss += d + + updatehealth() + if (prob(50)) + if(weakened <= 2) weakened = 2 + return + if(PROJECTILE_WEAKBULLETBURST) + var/d = 7 + + if (stat != 2) + bruteloss += d + + updatehealth() + if (prob(50)) + if(weakened <= 2) weakened = 2 + return + if(PROJECTILE_BULLETBURST) + var/d = 18 + + if (stat != 2) + bruteloss += d + + updatehealth() + if (prob(50)) + if(weakened <= 2) weakened = 2 + return if(PROJECTILE_TASER) if (prob(75) && stunned <= 10) stunned = 10 diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index aa0643e9708..16b9bc41067 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -299,6 +299,58 @@ if (prob(50)) if(weakened <= 5) weakened = 5 return + if(PROJECTILE_BULLETBURST) + armor = getarmor(affecting, "bullet") + var/d = 18 + if (prob(armor["armor"])) + show_message("\red Your [armor["clothes"]] absorbs the hit!", 4) + return + else + if (prob(armor["armor"]/2)) + show_message("\red Your [armor["clothes"]] only softens the hit!", 4) + if (prob(20)) + d = d / 2 + d = d / 4 + /* + else + if (istype(wear_suit, /obj/item/clothing/suit/swat_suit)) + if (prob(90)) + show_message("\red Your armor absorbs the blow!", 4) + return + else + if (prob(90)) + show_message("\red Your armor only softens the blow!", 4) + if (prob(60)) + d = d / 2 + d = d / 5*/ + if (istype(r_hand, /obj/item/weapon/shield/riot)) + if (prob(90)) + show_message("\red Your shield absorbs the blow!", 4) + return + else + if (prob(40)) + show_message("\red Your shield only softens the blow!", 4) + if (prob(60)) + d = d / 2 + d = d / 5 + else + if (istype(l_hand, /obj/item/weapon/shield/riot)) + if (prob(90)) + show_message("\red Your shield absorbs the blow!", 4) + return + else + if (prob(40)) + show_message("\red Your shield only softens the blow!", 4) + if (prob(60)) + d = d / 2 + d = d / 5 + if (stat != 2) + affecting.take_damage(d, 0) + UpdateDamageIcon() + updatehealth() + if (prob(50)) + if(weakened <= 2) weakened = 2 + return if(PROJECTILE_TASER) armor = getarmor(affecting, "taser") if (prob(armor["armor"])) @@ -483,6 +535,106 @@ updatehealth() if(weakened <= 5) weakened = 5 return + if(PROJECTILE_WEAKBULLETBURST) + armor = getarmor(affecting, "bullet") + var/d = 7 + if (prob(armor["armor"])) + show_message("\red Your [armor["clothes"]] absorbs the hit!", 4) + return + else + if (prob(armor["armor"]/2)) + show_message("\red Your [armor["clothes"]] only softens the hit!", 4) + if (prob(20)) + d = d / 2 + d = d / 4 + /*else + if (istype(wear_suit, /obj/item/clothing/suit/swat_suit)) + if (prob(90)) + show_message("\red Your armor absorbs the blow!", 4) + return + else + if (prob(90)) + show_message("\red Your armor only softens the blow!", 4) + if (prob(60)) + d = d / 2 + d = d / 5*/ + if (istype(r_hand, /obj/item/weapon/shield/riot)) + if (prob(90)) + show_message("\red Your shield absorbs the blow!", 4) + return + else + if (prob(40)) + show_message("\red Your shield only softens the blow!", 4) + if (prob(60)) + d = d / 2 + d = d / 5 + else + if (istype(l_hand, /obj/item/weapon/shield/riot)) + if (prob(90)) + show_message("\red Your shield absorbs the blow!", 4) + return + else + if (prob(40)) + show_message("\red Your shield only softens the blow!", 4) + if (prob(60)) + d = d / 2 + d = d / 5 + if (stat != 2) + affecting.take_damage(d, 0) + UpdateDamageIcon() + updatehealth() + if(weakened <= 2) weakened = 2 + return + if(PROJECTILE_WEAKERBULLETBURST) + armor = getarmor(affecting, "bullet") + var/d = 4 + if (prob(armor["armor"])) + show_message("\red Your [armor["clothes"]] absorbs the hit!", 4) + return + else + if (prob(armor["armor"]/2)) + show_message("\red Your [armor["clothes"]] only softens the hit!", 4) + if (prob(20)) + d = d / 2 + d = d / 4 + /*else + if (istype(wear_suit, /obj/item/clothing/suit/swat_suit)) + if (prob(90)) + show_message("\red Your armor absorbs the blow!", 4) + return + else + if (prob(90)) + show_message("\red Your armor only softens the blow!", 4) + if (prob(60)) + d = d / 2 + d = d / 5*/ + if (istype(r_hand, /obj/item/weapon/shield/riot)) + if (prob(90)) + show_message("\red Your shield absorbs the blow!", 4) + return + else + if (prob(40)) + show_message("\red Your shield only softens the blow!", 4) + if (prob(60)) + d = d / 2 + d = d / 5 + else + if (istype(l_hand, /obj/item/weapon/shield/riot)) + if (prob(90)) + show_message("\red Your shield absorbs the blow!", 4) + return + else + if (prob(40)) + show_message("\red Your shield only softens the blow!", 4) + if (prob(60)) + d = d / 2 + d = d / 5 + if (stat != 2) + affecting.take_damage(d, 0) + UpdateDamageIcon() + updatehealth() + if(weakened <= 2) weakened = 2 + return return /mob/living/carbon/human/emp_act(severity) diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index 985fc205e6b..9995cf894c4 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -156,6 +156,33 @@ if(PROJECTILE_BULLET) var/d = 1 + attacked += 10 + if (stat != 2) + bruteloss += d + + updatehealth() + return + if(PROJECTILE_BULLETBURST) + var/d = 1 + + attacked += 10 + if (stat != 2) + bruteloss += d + + updatehealth() + return + if(PROJECTILE_WEAKBULLETBURST) + var/d = 1 + + attacked += 10 + if (stat != 2) + bruteloss += d + + updatehealth() + return + if(PROJECTILE_WEAKERBULLETBURST) + var/d = 0.5 + attacked += 10 if (stat != 2) bruteloss += d diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 4bd62a06d78..4346abc8f9e 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -125,6 +125,12 @@ updatehealth() if (prob(50)) if(weakened <= 5) weakened = 5 + else if (flag == PROJECTILE_BULLETBURST) + if (stat != 2) + take_organ_damage(21, 0) + updatehealth() + if (prob(50)) + if(weakened <= 2) weakened = 2 else if (flag == PROJECTILE_TASER) if (prob(75) && stunned <= 10) stunned = 10 @@ -170,6 +176,16 @@ take_organ_damage(10, 0) updatehealth() if(weakened <= 5) weakened = 5 + else if (flag == PROJECTILE_WEAKBULLETBURST) + if (stat != 2) + take_organ_damage(5, 0) + updatehealth() + if(weakened <= 2) weakened = 2 + else if (flag == PROJECTILE_WEAKERBULLETBURST) + if (stat != 2) + take_organ_damage(3, 0) + updatehealth() + if(weakened <= 2) weakened = 2 return /mob/living/carbon/monkey/hand_p(mob/M as mob) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 2aec13b1587..c8f6e9ea72d 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -29,6 +29,26 @@ src.stunned = 10 else src.weakened = 10 + if(PROJECTILE_BULLETBURST) + if (istype(src, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = src + var/dam_zone = pick("chest", "chest", "chest", "groin", "head") + if (H.organs[text("[]", dam_zone)]) + var/datum/organ/external/affecting = H.organs[text("[]", dam_zone)] + if (affecting.take_damage(18, 0)) + H.UpdateDamageIcon() + else + H.UpdateDamage() + else + src.take_organ_damage(18) + src.updatehealth() + if (prob(80) && src.weakened <= 2) + src.weakened = 2 + if(PROJECTILE_TASER) + if (prob(75) && src.stunned <= 10) + src.stunned = 10 + else + src.weakened = 10 if(PROJECTILE_DART) src.weakened += 5 src.toxloss += 10 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index decd2203cb9..35ef05f66d8 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -269,6 +269,11 @@ bruteloss += 60 updatehealth() weakened = 10 + else if (flag == PROJECTILE_BULLETBURST) + if (stat != 2) + bruteloss += 21 + updatehealth() + weakened = 4 else if (flag == PROJECTILE_TASER) if (prob(75)) stunned = 15 diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index f63a72841f9..453dc7ad2ce 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -120,6 +120,11 @@ src.bruteloss += 60 src.updatehealth() src.weakened = 10 + else if (flag == PROJECTILE_BULLETBURST) + if (src.stat != 2) + src.bruteloss += 21 + src.updatehealth() + src.weakened = 4 else if (flag == PROJECTILE_TASER) if (prob(75)) src.stunned = 15 diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index d436b8bdc9c..72ce48afc82 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -257,6 +257,11 @@ bruteloss += 60 updatehealth() return + if(PROJECTILE_BULLETBURST) + if (stat != 2) + bruteloss += 21 + updatehealth() + return /* if(PROJECTILE_MEDBULLET) if (stat != 2) @@ -268,6 +273,16 @@ bruteloss += 15 updatehealth() return + if(PROJECTILE_WEAKBULLETBURST) + if (stat != 2) + bruteloss += 7 + updatehealth() + return + if(PROJECTILE_WEAKERBULLETBURST) + if (stat != 2) + bruteloss += 5 + updatehealth() + return /* if(PROJECTILE_MPBULLET) if (stat != 2) diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm index 1d0191eb6ef..d8cdc717df3 100644 --- a/code/modules/power/singularity/field_generator.dm +++ b/code/modules/power/singularity/field_generator.dm @@ -174,8 +174,14 @@ field_generator power level display bullet_act(flag) if (flag == PROJECTILE_BULLET) src.power -= 50 + else if (flag == PROJECTILE_BULLETBURST) + src.power -= 20 else if (flag == PROJECTILE_WEAKBULLET) src.power -= 25 + else if (flag == PROJECTILE_WEAKBULLETBURST) + src.power -= 13 + else if (flag == PROJECTILE_WEAKERBULLETBURST) + src.power -= 7 else if (flag == PROJECTILE_LASER) src.power += 20 else if (flag == PROJECTILE_SHOCK) diff --git a/config/admins.txt b/config/admins.txt index 20f5f1b9bca..2f118284d87 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -7,6 +7,7 @@ chicagoted - Game Master neofite - Game Master uristmcdorf - Game Master cinless - Game Master +firecage - Game Master mport2004 - Game Admin