cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-25 22:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7578 from Deantwo/BoomBoomBoom

Browse Source 
Fixes stock grenades
This commit is contained in:
Swag McYolosteinen
2015-02-10 17:47:29 +01:00
parent bc64407000 4a50eb5a50
commit 147b2fc28a
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/grenades/chem_grenade.dm
+14 -19
View File
@@ -1,10 +1,10 @@
#define EMPTY 0
#define WIRED 1
#define READY 2
#define EMPTY 1
#define WIRED 2
#define READY 3
/obj/item/weapon/grenade/chem_grenade
name = "grenade"
desc = "A do it yourself grenade casing!"
desc = "A custom made grenade."
icon_state = "chemg"
item_state = "flashbang"
w_class = 2
@@ -18,7 +18,7 @@
/obj/item/weapon/grenade/chem_grenade/New()
create_reagents(1000)
name = "[initial(name)] casing" // By adding the " casing" part here we can use initial(name) to get the final name, making it nice to say "large grenade" when it is a large grenade.
stage_change() // If no argument is set, it will change the stage to the current stage, useful for stock grenades that start READY.
/obj/item/weapon/grenade/chem_grenade/examine(mob/user)
@@ -121,18 +121,19 @@
/obj/item/weapon/grenade/chem_grenade/proc/stage_change(var/N)
stage = N
if (stage == EMPTY)
if(N)
stage = N
if(stage == EMPTY)
name = "[initial(name)] casing"
desc = initial(desc)
desc = "A do it yourself [initial(name)] casing!"
icon_state = initial(icon_state)
else if (stage == WIRED)
else if(stage == WIRED)
name = "unsecured [initial(name)]"
desc = "An unsecured [initial(name)] assembly."
icon_state = "[initial(icon_state)]_ass"
else if (stage == READY)
else if(stage == READY)
name = initial(name)
desc = "A custom made [initial(name)]."
desc = initial(desc)
icon_state = "[initial(icon_state)]_locked"
@@ -225,7 +226,7 @@
//Large chem grenades accept slime cores and use the appropriately.
/obj/item/weapon/grenade/chem_grenade/large
name = "large grenade"
desc = "An oversized grenade casing."
desc = "A custom made large grenade."
icon_state = "large_grenade"
allowed_containers = list(/obj/item/weapon/reagent_containers/glass,/obj/item/weapon/reagent_containers/food/condiment,
/obj/item/weapon/reagent_containers/food/drinks)
@@ -275,7 +276,6 @@
beakers += B1
beakers += B2
icon_state = "grenade"
/obj/item/weapon/grenade/chem_grenade/incendiary
@@ -294,7 +294,6 @@
beakers += B1
beakers += B2
icon_state = "grenade"
/obj/item/weapon/grenade/chem_grenade/antiweed
@@ -314,7 +313,6 @@
beakers += B1
beakers += B2
icon_state = "grenade"
/obj/item/weapon/grenade/chem_grenade/cleaner
@@ -333,7 +331,6 @@
beakers += B1
beakers += B2
icon_state = "grenade"
/obj/item/weapon/grenade/chem_grenade/teargas
@@ -353,7 +350,6 @@
beakers += B1
beakers += B2
icon_state = "grenade"
/obj/item/weapon/grenade/chem_grenade/facid
@@ -366,14 +362,13 @@
var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("facid", 100)
B1.reagents.add_reagent("facid", 25)
B1.reagents.add_reagent("potassium", 25)
B2.reagents.add_reagent("phosphorus", 25)
B2.reagents.add_reagent("sugar", 25)
beakers += B1
beakers += B2
icon_state = "grenade"
#undef EMPTY
#undef WIRED