cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-26 17:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,946 Commits 8 Branches 0 Tags
fab4ecff1d56bc34b6a71ba767fa943ebbc8f8ab
Commit Graph

6745 Commits

Author SHA1 Message Date
Rykka
6c1993e845 Small changes to POIs and the main outpost based on Virgo Feedback 
Quick/Speedmerge this please.
 2020-01-22 00:59:26 -07:00
ExabyteDiscord
8b64409351 Merge pull request #169 from Rykka-Stormheart/shep-dev-belt-miner 
Port Belt Mining over to Southern Cross, and adds Away Mission/Gateway Mission Framework!
 2020-01-21 22:47:36 -08:00
TheFurryFeline
1edc6cadd8 Restore areas 2020-01-20 20:06:48 -05:00
TheFurryFeline
0de231fb59 Part 1 of Redo 
Overwrite Reset.
 2020-01-20 20:04:38 -05:00
TheFurryFeline
8123a9e84b Restore Spelling Style 2020-01-20 19:49:48 -05:00
Rykka
cddcab68c4 Fix space turf transit direction, and fix APC floating 2020-01-20 00:35:59 -07:00
Rykka
884b250cd0 Turns out ignore_cavegen has atmos on it. Fixed with nomapgen/vacuum 2020-01-20 00:08:51 -07:00
Rykka
752181543a Turns out belt-miner.dmm had these varedits too, somehow. 2020-01-19 23:44:43 -07:00
Rykka
810758448d Fix the random health varedits... but these were literally everywhere 2020-01-19 23:42:48 -07:00
Rykka
98b5c0ab85 Reduce POI points to 3x 2020-01-19 23:09:49 -07:00
Rykka
11fe521410 Multiple POI fixes, fix the shuttles, fix active edges. WE GUCCI <3 2020-01-19 22:59:42 -07:00
Rykka
68885fbb8e Add transit area, fix base_turf values. <3 2020-01-19 19:04:17 -07:00
Rykka
0c4e6e7688 Add further groundwork to the submaps.dm file, adds Away + Gateway 2020-01-19 17:58:04 -07:00
Nadyr
9059616f9f -Removes extra APC in the Exploration Carrier recovery room which was causing power issues. 2020-01-18 21:04:40 -05:00
Nadyr
6e8da506ba Several small requested tweaks to the exploration carrier 
-Adds backup implants to the table outside of the medical area
-Adds waist holsters to the gun closets
-Adds an extra cataloger to the explorer lockers.
 2020-01-18 02:44:38 -05:00
Rykka
0d0294da39 Trying two fixes 2020-01-17 02:43:26 -07:00
Rykka
d6598b0322 Port Belt Mining over to Southern Cross! Mapedits for shuttle to follow 2020-01-17 02:08:34 -07:00
Nadyr
af5274a4f1 Active edge fix 2020-01-16 23:06:38 -05:00
Nadyr
f9895470d0 Plethora of changes related to the exploration carrier 
Basically,
-Areas for the carrier
-Code for the station-carrrier sling 
-Map changes including the carrier itself, the carrier sling,  areas for shuttle 3, relocation of exploration job spawns to the carrier, and removal of station lift emergency shutters
-Defines/presets for a new camera network and telcomms relay
 2020-01-16 17:14:36 -05:00
Nadyr
767465fc73 Shuttle 3 code 
Shuttle 3, destinations include the exploration carrier, southern cross hangar 3, and the Sif wilderness landing site
 2020-01-16 17:09:07 -05:00
Razgriz
e23e748ae2 Rollback cryopod fix 2020-01-16 02:44:49 -07:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
Hawk_v3
29831ba10f Compile fix and Mapfix 2020-01-13 20:39:06 +00:00
Hawk-v3
4623c3c1d1 Merge branch 'master' into master 2020-01-13 20:31:39 +00:00
Hawk_v3
dd45dbcf02 Missed a Surprise Window 
Fixed
 2020-01-13 18:52:19 +00:00
Hawk_v3
a4193432ac Map Fixes 
Fixed too many buttons.
OR tint works correctly.
Detective tint works.
Chemvator moved, Chem rearranged to allow space for a distil, and upper med corridor rearranged to allow it to actually be clear.
Piping fixed.
 2020-01-13 18:34:53 +00:00
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Hawk_v3
b20a284576 Map Fixes and Signage 2020-01-12 23:24:31 +00:00
RadiantFlash7
752bbe763f removes last of holodeckmaint 
Holodeck maint area stragglers removed.
 2020-01-12 03:09:42 -05:00
RadiantFlash7
847edc50cc misc map fixes. vending 
Adds the changes to YW vendor, and fixes to maps.
 2020-01-12 02:56:42 -05:00
RadiantFlash7
0be2f5c98e Revert "Vending machine changes+Warehouse fix" 
This reverts commit 8779e1b1d4.
 2020-01-12 02:46:18 -05:00
RadiantFlash7
8779e1b1d4 Vending machine changes+Warehouse fix 
Fixes cargo warehouse,
Applies new vending machine changes.
 2020-01-12 02:38:32 -05:00
RadiantFlash7
15993154b7 Revert "Revert "Fixes shuttle space tiles+mobtemp"" 
This reverts commit 719d42cbb4.
 2020-01-12 01:19:55 -05:00
RadiantFlash7
faf6e95ce3 Revert "Revert "Major map change+misc changes"" 
This reverts commit f0d4f38bf1.
 2020-01-12 01:19:47 -05:00
RadiantFlash7
f0d4f38bf1 Revert "Major map change+misc changes" 
This reverts commit fd22b5ca87.
 2020-01-12 01:16:31 -05:00
RadiantFlash7
719d42cbb4 Revert "Fixes shuttle space tiles+mobtemp" 
This reverts commit f1cac2635d.
 2020-01-12 01:16:25 -05:00
RadiantFlash7
f1cac2635d Fixes shuttle space tiles+mobtemp 
Allows mobs on cryogaia to survive in frigid conditions
replaces a few space tiles with turfs,
Also changes out all non shuttle/turfs on shuttles to shuttle turfs.
(caused space tiles)
 2020-01-11 22:19:08 -05:00
Heroman
bee3c7b9dd Fixes missing pipe to janitorial closet on asteroid 3 2020-01-12 12:21:16 +10:00
RadiantFlash7
fd22b5ca87 Major map change+misc changes 
Moves holodeck next to AI core,
expands botany and kitchen, adds fishfarm
Adds photocopiers and pappershredders about.
Fixes some bad cameras,
adds detective pistol back in, Why wasn't it there prior?
Adds ballestics back in.
 2020-01-11 18:41:51 -05:00
Novacat
24da40a882 Merge pull request #6426 from Heroman3003/dronedroppod 
Adds new random event: drone drop pod
 2020-01-11 01:19:16 -05:00
Heroman
47086d7bf0 Adds new event: drone drop pod 2020-01-11 16:02:12 +10:00
Novacat
ef4e6f3a6e Merge pull request #6421 from Heroman3003/surfacecryo 
Readds cryo to surface medical
 2020-01-11 00:14:24 -05:00
Heroman
9612d9c2e6 Fixes decals on a single tile 2020-01-11 12:08:26 +10:00
Heroman
efe0d3a5b3 Readds cryo to surface medical 2020-01-11 12:04:41 +10:00
Heroman
4e11d2c26a Removes and repositions the dispensers 2020-01-11 06:42:59 +10:00
Heroman
0c948f9425 Adds a bunch of wall nanomeds around station 2020-01-11 06:12:12 +10:00
Heroman
fc53e01103 Forgot a donut 2020-01-10 15:09:59 +10:00
Heroman
2a498da70e A variet of minor mapfixes 2020-01-10 14:52:27 +10:00
Heroman
cd3aac7006 Also implements map adjustments to avoid conflict 2020-01-10 10:11:00 +10:00
Heroman
e72ecf4453 Conflict resolution 2020-01-10 09:50:41 +10:00