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

Merge branch 'master' into areaStuff

Browse Source
This commit is contained in:
Heroman3003
2024-12-07 05:14:52 +10:00
committed by GitHub
parent cc22c4efbe 910e591986
commit 9941ffa8dc
187 changed files with 5545 additions and 1161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
maps/groundbase/gb-z1.dmm
+15 -2
View File
@@ -1820,6 +1820,15 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/closet/walllocker_double/hydrant/south,
/obj/item/hand_labeler,
/obj/item/storage/box/glasses/coffeecup,
/obj/item/storage/box/glasses/coffeecup,
/obj/item/storage/box/glasses/coffeecup,
/obj/item/storage/box/glasses/coffeecup,
/obj/item/storage/box/glasses/coffeecup_tall,
/obj/item/storage/box/glasses/coffeecup_grande,
/obj/item/storage/box/glasses/coffeecup_venti,
/turf/simulated/floor/lino,
/area/groundbase/civilian/cafe)
"dW" = (
@@ -5875,8 +5884,12 @@
/obj/random/mug,
/obj/random/mug,
/obj/item/reagent_containers/food/drinks/shaker{
pixel_x = 5;
pixel_y = 6
pixel_x = -7;
pixel_y = 18
},
/obj/machinery/chemical_dispenser/bar_syrup/full{
dir = 8;
pixel_x = 7
},
/turf/simulated/floor/lino,
/area/groundbase/civilian/cafe)
maps/groundbase/groundbase_events.dm
+1
View File
@@ -70,6 +70,7 @@
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Drone Pod Drop", /datum/event/drone_pod_drop, 40, list(ASSIGNMENT_SCIENTIST = 40), 1),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Morph Spawn", /datum/event/morph_spawn, 75, list(ASSIGNMENT_ANY = 5), 0),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Maintenance Predator", /datum/event/maintenance_predator, 100, list(ASSIGNMENT_ANY = 5), 0),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Maintenance Lurker", /datum/event/maintenance_lurker, 100, list(ASSIGNMENT_ANY = 5), 0),
new /datum/event_meta(EVENT_LEVEL_MODERATE, "Roaming Wildlife", /datum/event/roaming_wildlife, 20, list(ASSIGNMENT_SECURITY = 20, ASSIGNMENT_MEDICAL = 5), min_jobs = list(ASSIGNMENT_SECURITY = 2)),
)
add_disabled_events(list(