cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2022-10-02 22:05:32 -07:00
committed by GitHub
parent 892960d661
commit df46985d2e
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/_helpers/global_lists_vr.dm
View File

@@ -850,8 +850,6 @@ var/global/list/xenobio_rainbow_extracts = list(
/obj/item/slime_extract/emerald = 3,
/obj/item/slime_extract/light_pink = 1,
/obj/item/slime_extract/rainbow = 1)
<<<<<<< HEAD
=======
// AREA GENERATION AND BLUEPRINT STUFF BELOW HERE
@@ -874,8 +872,8 @@ var/global/list/xenobio_rainbow_extracts = list(
var/global/list/BUILDABLE_AREA_TYPES = list(
/area/space,
/area/mine,
// /area/surface/outside, //SC
// /area/surface/cave, //SC
/area/surface/outside, //SC
/area/surface/cave, //SC
/area/tether/surfacebase/outside,
/area/groundbase/unexplored/outdoors,
/area/maintenance/groundbase/level1,
@@ -889,8 +887,8 @@ var/global/list/BUILDABLE_AREA_TYPES = list(
var/static/list/blacklisted_areas = typecacheof(list(
/area/space,
/area/mine,
// /area/surface/outside, //SC
// /area/surface/cave, //SC
/area/surface/outside, //SC
/area/surface/cave, //SC
//TETHER STUFF BELOW THIS
/area/tether/surfacebase/outside,
//GROUNDBASE STUFF BELOW THIS
@@ -944,4 +942,3 @@ var/global/list/area_or_turf_fail_types = typecacheof(list(
/area/submap/event,
/area/submap/casino_event
))
>>>>>>> 420957ffec... Merge pull request #13828 from Cameron653/BUILDABLE_SHUTTLES