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

Accidental Consumption post-food refactor cleanup (#55152)

Browse Source 
Renames a bunch of vars to be more descriptive
    Removes old references to snacks
    Updates some code slightly
This commit is contained in:
MrMelbert
2020-11-26 14:41:26 +00:00
committed by GitHub
parent aa992c119b
commit c8536907fc
5 changed files with 91 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/_ammunition.dm
+3 -10
View File
@@ -50,19 +50,12 @@
/*
* On accidental consumption, 'spend' the ammo, and add in some gunpowder
*/
/obj/item/ammo_casing/on_accidental_consumption(mob/living/carbon/M, mob/living/carbon/user, obj/item/source_item, discover_after = TRUE)
/obj/item/ammo_casing/on_accidental_consumption(mob/living/carbon/victim, mob/living/carbon/user, obj/item/source_item, discover_after = TRUE)
if(BB)
BB = null
update_icon()
var/obj/item/reagent_containers/food/snacks/S = source_item
if(istype(S))
if(S.reagents)
S.reagents.add_reagent(/datum/reagent/gunpowder, S.reagents.total_volume*(2/3))
if(S.tastes?.len)
S.tastes += "salt"
S.tastes["salt"] = 3
M.reagents?.add_reagent(/datum/reagent/gunpowder, 3)
victim.reagents?.add_reagent(/datum/reagent/gunpowder, 3)
source_item?.reagents?.add_reagent(/datum/reagent/gunpowder, source_item.reagents.total_volume*(2/3))
return ..()