From 70176f71324affbd62f789d0e379154c122f83ae Mon Sep 17 00:00:00 2001 From: meyar Date: Tue, 13 Aug 2013 16:45:46 -0400 Subject: [PATCH 1/4] Gives those asshole greyshirts fukkin' air tanks. The fucks. --- code/game/jobs/job/assistant.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm index 2706d44aa4..270a4e3867 100644 --- a/code/game/jobs/job/assistant.dm +++ b/code/game/jobs/job/assistant.dm @@ -15,6 +15,10 @@ if(!H) return 0 H.equip_to_slot_or_del(new /obj/item/clothing/under/color/grey(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) return 1 /datum/job/assistant/get_access() From 2819b6ac961a8b9f763571773cd2cfceea505d62 Mon Sep 17 00:00:00 2001 From: meyar Date: Tue, 13 Aug 2013 16:49:17 -0400 Subject: [PATCH 2/4] Gives IA security headsets as DEMOCRACY'D here: http://baystation12.net/forums/viewtopic.php?f=5&t=8096 --- code/game/jobs/job/civilian.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index a7e24bf1e2..8d9e0875dc 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -342,6 +342,7 @@ equip(var/mob/living/carbon/human/H) if(!H) return 0 + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_ears) switch(H.backbag) if(2) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(H), slot_back) if(3) H.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel_norm(H), slot_back) From e74782bbdbe301822f6e94f5f72eebfd51f3a89d Mon Sep 17 00:00:00 2001 From: meyar Date: Tue, 13 Aug 2013 16:51:15 -0400 Subject: [PATCH 3/4] Unfucks pepper spray. IT ACTUALLY DOES THINGS NOW. KO spray replaced with stun/weaken. --- code/modules/reagents/Chemistry-Reagents.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 5b107276a0..75e315373f 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -2035,8 +2035,10 @@ datum victim << "\red Your [safe_thing] protect you from most of the pepperspray!" victim.eye_blurry = max(M.eye_blurry, 15) victim.eye_blind = max(M.eye_blind, 5) - victim.Paralyse(1) - victim.drop_item() + victim.Stun(5) + victim.Weaken(5) + //victim.Paralyse(10) + //victim.drop_item() return else if ( eyes_covered ) // Eye cover is better than mouth cover victim << "\red Your [safe_thing] protects your eyes from the pepperspray!" @@ -2048,8 +2050,10 @@ datum victim << "\red You're sprayed directly in the eyes with pepperspray!" victim.eye_blurry = max(M.eye_blurry, 25) victim.eye_blind = max(M.eye_blind, 10) - victim.Paralyse(1) - victim.drop_item() + victim.Stun(5) + victim.Weaken(5) + //victim.Paralyse(10) + //victim.drop_item() frostoil name = "Frost Oil" From 551fee16eb1785f9cadf063aaf88e1f6c693bab2 Mon Sep 17 00:00:00 2001 From: meyar Date: Tue, 13 Aug 2013 16:51:48 -0400 Subject: [PATCH 4/4] Removes nook awps stunlock. Nerfs SAW back to where it should be, 25 damage, not 60. Fuckin' SAW. --- code/modules/projectiles/ammunition/bullets.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/projectiles/ammunition/bullets.dm b/code/modules/projectiles/ammunition/bullets.dm index 412ff260ec..41443469d3 100644 --- a/code/modules/projectiles/ammunition/bullets.dm +++ b/code/modules/projectiles/ammunition/bullets.dm @@ -47,7 +47,7 @@ /obj/item/ammo_casing/a12mm desc = "A 12mm bullet casing." caliber = "12mm" - projectile_type = "/obj/item/projectile/bullet/midbullet" + projectile_type = "/obj/item/projectile/bullet/midbullet2" /obj/item/ammo_casing/shotgun @@ -93,4 +93,4 @@ /obj/item/ammo_casing/a762 desc = "A 7.62 bullet casing." caliber = "a762" - projectile_type = "/obj/item/projectile/bullet" + projectile_type = "/obj/item/projectile/bullet/a762"