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

Merge pull request #4751 from VOREStation/upstream-merge-5869

Browse Source 
[MIRROR] Adds the Zaddat Race + Modifies pressure damage calculations
This commit is contained in:
Novacat
2019-03-28 18:17:11 -04:00
committed by GitHub
parent da5d9c5013 ad181e797a
commit 65cd059497
42 changed files with 405 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+2 -1
View File
@@ -49,7 +49,8 @@
starts_with = list(
/obj/item/weapon/reagent_containers/food/drinks/milk = 6,
/obj/item/weapon/reagent_containers/food/drinks/soymilk = 4,
/obj/item/weapon/storage/fancy/egg_box = 4)
/obj/item/weapon/storage/fancy/egg_box = 4,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose = 2)
/obj/structure/closet/secure_closet/freezer/money
code/game/objects/structures/loot_piles.dm
+2 -1
View File
@@ -194,7 +194,8 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/device/camera,
/obj/item/device/pda,
/obj/item/device/radio/headset,
/obj/item/device/paicard
/obj/item/device/paicard,
/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/glucose
)
uncommon_loot = list(