cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved reagent IDs to defines. (#10636)

Browse Source 
* Moved reagent IDs to defines.

TODO: Convert xenoarch chems.

* Added xenoarch chem defines

* Fixed some bad chem names.
This commit is contained in:
ComicIronic
2016-06-19 21:43:37 +01:00
committed by clusterfack
parent 8423059397
commit 11119d4d0b
206 changed files with 3416 additions and 3095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/guns/projectile/constructable/blunderbuss.dm
View File

@@ -136,7 +136,7 @@
return
var/pure_fuel = 1
for (var/datum/reagent/current_reagent in S.reagents.reagent_list)
if (current_reagent.id != "fuel")
if (current_reagent.id != FUEL)
pure_fuel = 0
if(!pure_fuel)
to_chat(user, "<span class='warning'>\The [src] won't fire if you fill it with anything but pure welding fuel!</span>")
@@ -146,7 +146,7 @@
if((fuel_level + transfer_amount) >= max_fuel)
transfer_amount = max_fuel-fuel_level
full = 1
S.reagents.remove_reagent("fuel", transfer_amount)
S.reagents.remove_reagent(FUEL, transfer_amount)
fuel_level += transfer_amount
if(full)
to_chat(user, "<span class='notice'>You fill \the [src] to the brim with fuel from \the [S].</span>")

4
code/modules/projectiles/guns/projectile/constructable/cannon.dm
View File

@@ -124,7 +124,7 @@
return
var/pure_fuel = 1
for (var/datum/reagent/current_reagent in S.reagents.reagent_list)
if (current_reagent.id != "fuel")
if (current_reagent.id != FUEL)
pure_fuel = 0
if(!pure_fuel)
to_chat(user, "<span class='warning'>\The [src] won't fire if you fill it with anything but pure welding fuel!</span>")
@@ -134,7 +134,7 @@
if((fuel_level + transfer_amount) >= max_fuel)
transfer_amount = max_fuel-fuel_level
full = 1
S.reagents.remove_reagent("fuel", transfer_amount)
S.reagents.remove_reagent(FUEL, transfer_amount)
fuel_level += transfer_amount
if(full)
to_chat(user, "<span class='notice'>You fill \the [src] to the brim with fuel from \the [S].</span>")

2
code/modules/projectiles/guns/projectile/siren.dm
View File

@@ -21,7 +21,7 @@
/obj/item/weapon/gun/siren/New()
..()
create_reagents(max_reagents)
reagents.add_reagent("water", max_reagents)
reagents.add_reagent(WATER, max_reagents)
/obj/item/weapon/gun/siren/verb/flush_reagents()
set name = "Flush siren"