cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-20 11:40:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] default instakill rifle doesnt delete itself (#7172)

Browse Source 
* default instakill rifle doesnt delete itself (#60439)

* default instakill rifle doesnt delete itself

Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-07-28 19:02:52 +01:00
committed by GitHub
co-authored by Fikou
parent 43a2cd6437
commit 8e563aa42b
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/capture_the_flag/ctf_classes.dm
+5 -5
View File
@@ -61,7 +61,7 @@
/datum/outfit/ctf/instagib
name = "CTF Instagib (Solo)"
r_hand = /obj/item/gun/energy/laser/instakill
r_hand = /obj/item/gun/energy/laser/instakill/ctf
shoes = /obj/item/clothing/shoes/jackboots/fast
icon_state = "ctf_instakill"
class_description = "General purpose combat class. Armed with a laser rifle and backup pistol."
@@ -99,7 +99,7 @@
/datum/outfit/ctf/red/instagib
name = "CTF Instagib (Red)"
r_hand = /obj/item/gun/energy/laser/instakill/red
r_hand = /obj/item/gun/energy/laser/instakill/ctf/red
shoes = /obj/item/clothing/shoes/jackboots/fast
team_radio_freq = FREQ_CTF_RED
@@ -134,7 +134,7 @@
/datum/outfit/ctf/blue/instagib
name = "CTF Instagib (Blue)"
r_hand = /obj/item/gun/energy/laser/instakill/blue
r_hand = /obj/item/gun/energy/laser/instakill/ctf/blue
shoes = /obj/item/clothing/shoes/jackboots/fast
team_radio_freq = FREQ_CTF_BLUE
@@ -169,7 +169,7 @@
/datum/outfit/ctf/green/instagib
name = "CTF Instagib (Green)"
r_hand = /obj/item/gun/energy/laser/instakill/green
r_hand = /obj/item/gun/energy/laser/instakill/ctf/green
shoes = /obj/item/clothing/shoes/jackboots/fast
team_radio_freq = FREQ_CTF_GREEN
@@ -204,7 +204,7 @@
/datum/outfit/ctf/yellow/instagib
name = "CTF Instagib (Yellow)"
r_hand = /obj/item/gun/energy/laser/instakill/yellow
r_hand = /obj/item/gun/energy/laser/instakill/ctf/yellow
shoes = /obj/item/clothing/shoes/jackboots/fast
team_radio_freq = FREQ_CTF_YELLOW
code/modules/capture_the_flag/ctf_equipment.dm
+8 -8
View File
@@ -162,13 +162,13 @@
ammo_x_offset = 2
shaded_charge = FALSE
/obj/item/gun/energy/laser/instakill/Initialize()
. = ..()
AddElement(/datum/element/delete_on_drop)
/obj/item/gun/energy/laser/instakill/emp_act() //implying you could stop the instagib
return
/obj/item/gun/energy/laser/instakill/ctf/Initialize()
. = ..()
AddElement(/datum/element/delete_on_drop)
/obj/item/ammo_casing/energy/instakill
projectile_type = /obj/projectile/beam/instakill
e_cost = 0
@@ -279,7 +279,7 @@
// Instakill
/obj/item/gun/energy/laser/instakill/red
/obj/item/gun/energy/laser/instakill/ctf/red
desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a red design."
icon_state = "instagibred"
inhand_icon_state = "instagibred"
@@ -338,7 +338,7 @@
// Instakill
/obj/item/gun/energy/laser/instakill/blue
/obj/item/gun/energy/laser/instakill/ctf/blue
desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a blue design."
icon_state = "instagibblue"
inhand_icon_state = "instagibblue"
@@ -404,7 +404,7 @@
// Instakill
/obj/item/gun/energy/laser/instakill/green
/obj/item/gun/energy/laser/instakill/ctf/green
desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a green design."
icon_state = "instagibgreen"
inhand_icon_state = "instagibgreen"
@@ -470,7 +470,7 @@
// Instakill
/obj/item/gun/energy/laser/instakill/yellow
/obj/item/gun/energy/laser/instakill/ctf/yellow
desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a yellow design."
icon_state = "instagibyellow"
inhand_icon_state = "instagibyellow"