From c3d2dbe00acd2a34961005e362c3c33196258ac1 Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 27 May 2017 09:27:00 -0500 Subject: [PATCH 1/3] Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value --- code/game/gamemodes/gang/gang_datum.dm | 2 +- code/game/gamemodes/gang/gang_items.dm | 27 ++++++++++++------- code/game/gamemodes/gang/gang_items.dm.rej | 17 ++++++++++++ .../projectiles/ammunition/ammo_casings.dm | 9 ++++++- .../boxes_magazines/external_mag.dm | 13 ++++++++- .../guns/ballistic/automatic.dm.rej | 13 +++++++++ .../modules/projectiles/projectile/bullets.dm | 23 ++++++++++++++++ .../projectiles/projectile/bullets.dm.rej | 10 +++++++ 8 files changed, 101 insertions(+), 13 deletions(-) create mode 100644 code/game/gamemodes/gang/gang_items.dm.rej create mode 100644 code/modules/projectiles/guns/ballistic/automatic.dm.rej create mode 100644 code/modules/projectiles/projectile/bullets.dm.rej diff --git a/code/game/gamemodes/gang/gang_datum.dm b/code/game/gamemodes/gang/gang_datum.dm index 0ff9ef4f2d..f7d30b96a0 100644 --- a/code/game/gamemodes/gang/gang_datum.dm +++ b/code/game/gamemodes/gang/gang_datum.dm @@ -76,7 +76,7 @@ /datum/gang_item/clothing/hands, /datum/gang_item/clothing/belt, - /datum/gang_item/weapon/shuriken, + /datum/gang_item/weapon/shuriken, /datum/gang_item/weapon/switchblade, /datum/gang_item/weapon/improvised, /datum/gang_item/weapon/ammo/improvised_ammo, diff --git a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm index aec9b040cd..075b42640b 100644 --- a/code/game/gamemodes/gang/gang_items.dm +++ b/code/game/gamemodes/gang/gang_items.dm @@ -111,7 +111,7 @@ /datum/gang_item/clothing/hat name = "Pimp Hat" id = "hat" - cost = 18 + cost = 16 item_path = /obj/item/clothing/head/collectable/petehat/gang /obj/item/clothing/head/collectable/petehat/gang @@ -121,7 +121,7 @@ /datum/gang_item/clothing/mask name = "Golden Death Mask" id = "mask" - cost = 20 + cost = 18 item_path = /obj/item/clothing/mask/gskull /obj/item/clothing/mask/gskull @@ -133,7 +133,7 @@ /datum/gang_item/clothing/shoes name = "Bling Boots" id = "boots" - cost = 25 + cost = 22 item_path = /obj/item/clothing/shoes/gang /obj/item/clothing/shoes/gang @@ -144,14 +144,14 @@ /datum/gang_item/clothing/neck name = "Gold Necklace" id = "necklace" - cost = 10 + cost = 9 item_path = /obj/item/clothing/neck/necklace/dope /datum/gang_item/clothing/hands name = "Decorative Brass Knuckles" id = "hand" - cost = 12 + cost = 11 item_path = /obj/item/clothing/gloves/gang /obj/item/clothing/gloves/gang @@ -163,7 +163,7 @@ /datum/gang_item/clothing/belt name = "Badass Belt" id = "belt" - cost = 15 + cost = 13 item_path = /obj/item/weapon/storage/belt/military/gang /obj/item/weapon/storage/belt/military/gang @@ -215,7 +215,6 @@ name = "Sawn-Off Improvised Shotgun" id = "sawn" cost = 6 - item_path = /obj/item/weapon/gun/ballistic/revolver/doublebarrel/improvised/sawn /datum/gang_item/weapon/ammo/improvised_ammo name = "Box of Buckshot" @@ -236,16 +235,24 @@ item_path = /obj/item/ammo_box/magazine/m10mm /datum/gang_item/weapon/sniper - name = ".50cal Sniper Rifle" + name = "Black Market .50cal Sniper Rifle" id = "sniper" cost = 40 item_path = /obj/item/weapon/gun/ballistic/automatic/sniper_rifle /datum/gang_item/weapon/ammo/sniper_ammo - name = "Standard .50cal Sniper Rounds" + name = "Smuggled .50cal Sniper Rounds" id = "sniper_ammo" cost = 15 - item_path = /obj/item/ammo_box/magazine/sniper_rounds + item_path = /obj/item/ammo_box/magazine/sniper_rounds/gang + + +/datum/gang_item/weapon/ammo/sleeper_ammo + name = "Illicit Tranquilizer Cartridges" + id = "sniper_ammo" + cost = 15 + item_path = /obj/item/ammo_box/magazine/sniper_rounds/gang/sleeper + /datum/gang_item/weapon/machinegun name = "Mounted Machine Gun" diff --git a/code/game/gamemodes/gang/gang_items.dm.rej b/code/game/gamemodes/gang/gang_items.dm.rej new file mode 100644 index 0000000000..cdc0d35918 --- /dev/null +++ b/code/game/gamemodes/gang/gang_items.dm.rej @@ -0,0 +1,17 @@ +diff a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm (rejected hunks) +@@ -325,13 +325,13 @@ + user.put_in_hands(O) + if(spawn_msg) + to_chat(user, spawn_msg) +- ++ + /datum/gang_item/equipment/wetwork_boots + name = "Wetwork boots" + id = "wetwork" + cost = 20 + item_path = /obj/item/clothing/shoes/combat/gang +- ++ + /obj/item/clothing/shoes/combat/gang + name = "Wetwork boots" + desc = "A gang's best hitmen are prepared for anything." diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm index 65b9ef926f..d91859f198 100644 --- a/code/modules/projectiles/ammunition/ammo_casings.dm +++ b/code/modules/projectiles/ammunition/ammo_casings.dm @@ -117,7 +117,7 @@ desc = "A .50 bullet casing, specialised in sending the target to sleep, instead of hell." caliber = ".50" projectile_type = /obj/item/projectile/bullet/sniper/soporific - icon_state = ".50" + icon_state = "sleeper" /obj/item/ammo_casing/haemorrhage desc = "A .50 bullet casing, specialised in causing massive bloodloss" @@ -131,7 +131,14 @@ projectile_type = /obj/item/projectile/bullet/sniper/penetrator icon_state = ".50" +/obj/item/ammo_casing/point50/gang + desc = "A black market .50 bullet casing." + projectile_type = /obj/item/projectile/bullet/sniper/gang +/obj/item/ammo_casing/point50/gang/sleeper + desc = "Am illegally modified tranquilizer round." + projectile_type = /obj/item/projectile/bullet/sniper/gang/sleeper + icon_state = "sleeper" /// SAW ROUNDS diff --git a/code/modules/projectiles/boxes_magazines/external_mag.dm b/code/modules/projectiles/boxes_magazines/external_mag.dm index c2a7129b4e..6c798efe3e 100644 --- a/code/modules/projectiles/boxes_magazines/external_mag.dm +++ b/code/modules/projectiles/boxes_magazines/external_mag.dm @@ -264,6 +264,17 @@ origin_tech = "combat=6;syndicate=3" max_ammo = 5 +/obj/item/ammo_box/magazine/sniper_rounds/gang + name = "black market sniper rounds (.50)" + icon_state = ".50mag" + origin_tech = "combat=6" + ammo_type = /obj/item/ammo_casing/point50/gang + +/obj/item/ammo_box/magazine/sniper_rounds/gang/sleeper + name = "illegally modified tranquilizer round" + icon_state = "soporific" + origin_tech = "combat=6" + ammo_type = /obj/item/ammo_casing/point50/gang/sleeper //// SAW MAGAZINES @@ -371,4 +382,4 @@ icon_state = "oldrifle-[round(ammo_count(),4)]" /obj/item/ammo_box/magazine/recharge/attack_self() //No popping out the "bullets" - return \ No newline at end of file + return diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm.rej b/code/modules/projectiles/guns/ballistic/automatic.dm.rej new file mode 100644 index 0000000000..9f4d4f92bd --- /dev/null +++ b/code/modules/projectiles/guns/ballistic/automatic.dm.rej @@ -0,0 +1,13 @@ +diff a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm (rejected hunks) +@@ -375,7 +375,10 @@ + pin = /obj/item/device/firing_pin/implant/pindicate + origin_tech = "combat=7;syndicate=6" + +- ++/obj/item/weapon/gun/ballistic/automatic/sniper_rifle/gang ++ name = "black market sniper rifle" ++ desc = "A long ranged weapon that does significant damage. It is well worn from years of service." ++ mag_type = /obj/item/ammo_box/magazine/sniper_rounds/gang + + // Old Semi-Auto Rifle // + diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index 0594c17469..b951960c76 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -279,7 +279,30 @@ target.ex_act(rand(1,2)) return ..() +/obj/item/projectile/bullet/sniper/gang + damage = 55 + stun = 1 + weaken = 1 + dismemberment = 15 + armour_penetration = 25 +/obj/item/projectile/bullet/sniper/gang/sleeper + nodamage = 1 + stun = 0 + weaken = 0 + dismemberment = 0 + breakthings = FALSE + +/obj/item/projectile/bullet/sniper/gang/sleeper/on_hit(atom/target, blocked = 0) + if((blocked != 100) && isliving(target)) + var/mob/living/L = target + L.blur_eyes(8) + if(L.staminaloss >= 40) + L.Sleeping(20) + else + L.adjustStaminaLoss(55) + return 1 + /obj/item/projectile/bullet/sniper/soporific armour_penetration = 0 nodamage = 1 diff --git a/code/modules/projectiles/projectile/bullets.dm.rej b/code/modules/projectiles/projectile/bullets.dm.rej new file mode 100644 index 0000000000..8666f242ca --- /dev/null +++ b/code/modules/projectiles/projectile/bullets.dm.rej @@ -0,0 +1,10 @@ +diff a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm (rejected hunks) +@@ -244,7 +244,7 @@ + name = "\improper DNA injector" + icon_state = "syringeproj" + var/obj/item/weapon/dnainjector/injector +- ++ + /obj/item/projectile/bullet/dnainjector/on_hit(atom/target, blocked = 0) + if(iscarbon(target)) + var/mob/living/carbon/M = target From b4cd9de3e4ccae89a648653ff70487c9e955a233 Mon Sep 17 00:00:00 2001 From: kevinz000 Date: Sat, 27 May 2017 13:39:06 -0700 Subject: [PATCH 2/3] newline errors --- code/game/gamemodes/gang/gang_items.dm.rej | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 code/game/gamemodes/gang/gang_items.dm.rej diff --git a/code/game/gamemodes/gang/gang_items.dm.rej b/code/game/gamemodes/gang/gang_items.dm.rej deleted file mode 100644 index cdc0d35918..0000000000 --- a/code/game/gamemodes/gang/gang_items.dm.rej +++ /dev/null @@ -1,17 +0,0 @@ -diff a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm (rejected hunks) -@@ -325,13 +325,13 @@ - user.put_in_hands(O) - if(spawn_msg) - to_chat(user, spawn_msg) -- -+ - /datum/gang_item/equipment/wetwork_boots - name = "Wetwork boots" - id = "wetwork" - cost = 20 - item_path = /obj/item/clothing/shoes/combat/gang -- -+ - /obj/item/clothing/shoes/combat/gang - name = "Wetwork boots" - desc = "A gang's best hitmen are prepared for anything." From be3879993371920627061bf91b830b1c72e59d8f Mon Sep 17 00:00:00 2001 From: LetterJay Date: Mon, 5 Jun 2017 22:39:51 -0500 Subject: [PATCH 3/3] cleanup --- .../modules/projectiles/guns/ballistic/automatic.dm | 5 +++++ .../projectiles/guns/ballistic/automatic.dm.rej | 13 ------------- code/modules/projectiles/projectile/bullets.dm.rej | 10 ---------- 3 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 code/modules/projectiles/guns/ballistic/automatic.dm.rej delete mode 100644 code/modules/projectiles/projectile/bullets.dm.rej diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm index 70d399b107..dd789798c6 100644 --- a/code/modules/projectiles/guns/ballistic/automatic.dm +++ b/code/modules/projectiles/guns/ballistic/automatic.dm @@ -379,6 +379,11 @@ pin = /obj/item/device/firing_pin/implant/pindicate origin_tech = "combat=7;syndicate=6" +/obj/item/weapon/gun/ballistic/automatic/sniper_rifle/gang + name = "black market sniper rifle" + desc = "A long ranged weapon that does significant damage. It is well worn from years of service." + mag_type = /obj/item/ammo_box/magazine/sniper_rounds/gang + // Old Semi-Auto Rifle // /obj/item/weapon/gun/ballistic/automatic/surplus diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm.rej b/code/modules/projectiles/guns/ballistic/automatic.dm.rej deleted file mode 100644 index 9f4d4f92bd..0000000000 --- a/code/modules/projectiles/guns/ballistic/automatic.dm.rej +++ /dev/null @@ -1,13 +0,0 @@ -diff a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm (rejected hunks) -@@ -375,7 +375,10 @@ - pin = /obj/item/device/firing_pin/implant/pindicate - origin_tech = "combat=7;syndicate=6" - -- -+/obj/item/weapon/gun/ballistic/automatic/sniper_rifle/gang -+ name = "black market sniper rifle" -+ desc = "A long ranged weapon that does significant damage. It is well worn from years of service." -+ mag_type = /obj/item/ammo_box/magazine/sniper_rounds/gang - - // Old Semi-Auto Rifle // - diff --git a/code/modules/projectiles/projectile/bullets.dm.rej b/code/modules/projectiles/projectile/bullets.dm.rej deleted file mode 100644 index 8666f242ca..0000000000 --- a/code/modules/projectiles/projectile/bullets.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm (rejected hunks) -@@ -244,7 +244,7 @@ - name = "\improper DNA injector" - icon_state = "syringeproj" - var/obj/item/weapon/dnainjector/injector -- -+ - /obj/item/projectile/bullet/dnainjector/on_hit(atom/target, blocked = 0) - if(iscarbon(target)) - var/mob/living/carbon/M = target