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

Merge remote-tracking branch 'ParadiseSS13/master' into toml-config

Browse Source
This commit is contained in:
AffectedArc07
2021-07-13 14:25:12 +01:00
parent 9ddf4ceb97 5124f5ef7e
commit 035964ceb2
43 changed files with 857 additions and 1010 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/spell.dm
+1 -1
View File
@@ -503,8 +503,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell))
revert_cast(user)
return FALSE
perform(targets, user = user, make_attack_logs = create_logs)
remove_ranged_ability(user)
perform(targets, user = user, make_attack_logs = create_logs)
return TRUE
/* Checks if a target is valid
code/datums/supplypacks.dm
+4 -3
View File
@@ -572,9 +572,10 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
containername = "electrical maintenance crate"
/datum/supply_packs/vending/engivend
name = "EngiVend Supply Crate"
cost = 15
contains = list(/obj/item/vending_refill/engivend)
name = "Engineering Vendor Supply Crate"
cost = 20
contains = list(/obj/item/vending_refill/engivend,
/obj/item/vending_refill/youtool)
containername = "engineering supply crate"
/datum/supply_packs/engineering/powergamermitts