mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-31 09:09:49 +01:00
[MIRROR] Ports trash throw vore from Chomp (#8109)
Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com> Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
co-authored by
SatinIsle
Kashargul
parent
d4b706b93c
commit
e2e1b525f4
@@ -661,8 +661,6 @@ VIRGO3C_TURF_CREATE(/turf/simulated/floor/tiled/asteroid_steel/outdoors)
|
||||
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
/turf/simulated/open/virgo3c
|
||||
VIRGO3C_SET_ATMOS
|
||||
|
||||
@@ -685,7 +683,6 @@ VIRGO3C_TURF_CREATE(/turf/simulated/floor/tiled/asteroid_steel/outdoors)
|
||||
VIRGO3C_SET_ATMOS
|
||||
outdoors = 0
|
||||
|
||||
>>>>>>> 723789a563... Small fix for planetary lighting (#15783)
|
||||
/turf/simulated/floor/outdoors/grass/virgo3c
|
||||
VIRGO3C_SET_ATMOS
|
||||
|
||||
|
||||
Reference in New Issue
Block a user