cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into barber-update

Browse Source
This commit is contained in:
Fox-McCloud
2015-11-06 06:30:59 -05:00
parent 1c8df180f8 d504f33752
commit 2335c6be9d
9 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/event_container.dm
+1 -1
View File
@@ -170,7 +170,7 @@ var/list/event_last_fired = list()
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Flux Anomaly", /datum/event/anomaly/anomaly_flux, 50, list(ASSIGNMENT_ENGINEER = 50)),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Gravitational Anomaly", /datum/event/anomaly/anomaly_grav, 200),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Revenant", /datum/event/revenant, 150),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Swarmer Spawn", /datum/event/spawn_swarmer, 150, list(ASSIGNMENT_ANY = 100), 1)
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Swarmer Spawn", /datum/event/spawn_swarmer, 150, is_one_shot = 1)
)
/datum/event_container/major
code/modules/reagents/reagent_containers/food/snacks.dm
+2
View File
@@ -1989,6 +1989,7 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("synaptizine", 5)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/spesslaw
@@ -2000,6 +2001,7 @@
New()
..()
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("synaptizine", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel