cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7122 from Codeatmos/Baynottim

Browse Source 
Pick up this bayonet and stab that man NICKVR to death.
This commit is contained in:
Nichlas Pihl
2019-11-27 09:08:39 +00:00
committed by GitHub
parent b3571e0947 ddb836ad30
commit d5aa28f2fd
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/kitchen.dm
View File

@@ -76,7 +76,7 @@
attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
sharpness = IS_SHARP_ACCURATE sharpness = IS_SHARP_ACCURATE
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
var/bayonet = FALSE //Can this be attached to a gun? var/bayonet = TRUE //Can this be attached to a gun?
custom_price = 30 custom_price = 30
/obj/item/kitchen/knife/Initialize() /obj/item/kitchen/knife/Initialize()
@@ -118,6 +118,7 @@
attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
w_class = WEIGHT_CLASS_NORMAL w_class = WEIGHT_CLASS_NORMAL
custom_price = 60 custom_price = 60
bayonet = TRUE
/obj/item/kitchen/knife/combat /obj/item/kitchen/knife/combat
name = "combat knife" name = "combat knife"
@@ -149,6 +150,7 @@
force = 15 force = 15
throwforce = 15 throwforce = 15
materials = list() materials = list()
bayonet = TRUE
/obj/item/kitchen/knife/combat/cyborg /obj/item/kitchen/knife/combat/cyborg
name = "cyborg knife" name = "cyborg knife"

3
code/modules/projectiles/guns/ballistic/shotgun.dm
View File

@@ -177,6 +177,7 @@
sawn_desc = "I'm just here for the gasoline." sawn_desc = "I'm just here for the gasoline."
unique_reskin = null unique_reskin = null
var/slung = FALSE var/slung = FALSE
can_bayonet = TRUE //STOP WATCHING THIS FILTH MY FELLOW CARGONIAN,WE MUST DEFEND OURSELVES
/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/attackby(obj/item/A, mob/user, params) /obj/item/gun/ballistic/shotgun/doublebarrel/improvised/attackby(obj/item/A, mob/user, params)
..() ..()
@@ -210,3 +211,5 @@
w_class = WEIGHT_CLASS_NORMAL w_class = WEIGHT_CLASS_NORMAL
sawn_off = TRUE sawn_off = TRUE
slot_flags = ITEM_SLOT_BELT slot_flags = ITEM_SLOT_BELT
can_bayonet = FALSE