shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gang War: Replaces sniper rifle with weaker version, nonlethal ammo, tweaks bling value

Browse Source
This commit is contained in:
CitadelStationBot
2017-05-27 09:27:00 -05:00
parent 0e9f17b14a
commit c3d2dbe00a
8 changed files with 101 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/gang/gang_datum.dm
+1 -1
View File
@@ -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,
code/game/gamemodes/gang/gang_items.dm
+17 -10
View File
@@ -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"
code/game/gamemodes/gang/gang_items.dm.rej
+17
View File
@@ -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."
code/modules/projectiles/ammunition/ammo_casings.dm
+8 -1
View File
@@ -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
code/modules/projectiles/boxes_magazines/external_mag.dm
+12 -1
View File
@@ -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
return
code/modules/projectiles/guns/ballistic/automatic.dm.rej
+13
View File
@@ -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 //
code/modules/projectiles/projectile/bullets.dm
+23
View File
@@ -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
code/modules/projectiles/projectile/bullets.dm.rej
+10
View File
@@ -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