cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 14:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,407 Commits 7 Branches 0 Tags
17d336009ee0a2ee7482b1a98dd7f4ea5c1bfbd1
Commit Graph

24399 Commits

Author SHA1 Message Date
Repede
17d336009e Merge branch 'master' into Holdelta-RPD-Addition 2020-01-12 14:57:03 -05:00
Repede
e671d2d799 Merge branch 'master' into Howl'n 2020-01-12 14:36:47 -05:00
Repede
2d453d354b Merge branch 'master' into Holdelta-RPD-Addition 2020-01-12 14:36:25 -05:00
RadiantFlash7
cda5c1e3e3 YW comment eddits 
Proper commenting.
 2020-01-12 12:08:08 -05:00
Holdelta
dcf9a12a12 Update disposal-construction.dm 2020-01-12 00:34:06 -08:00
Holdelta
c600762039 Add files via upload 2020-01-11 23:39:05 -08:00
Holdelta
b24d324ad9 Update station_vr.dm 2020-01-11 23:38:00 -08:00
Holdelta
2bcd08a098 Update station.dm 2020-01-11 23:37:06 -08:00
RadiantFlash7
7de718e369 Revert "Revert "2.21"" 
This reverts commit d3885d57f4.
 2020-01-12 01:20:36 -05:00
RadiantFlash7
6362eac935 Revert "Revert "2.2"" 
This reverts commit d71cb2b6e2.
 2020-01-12 01:20:03 -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
d71cb2b6e2 Revert "2.2" 
This reverts commit 08877da8ad.
 2020-01-12 01:16:10 -05:00
RadiantFlash7
d3885d57f4 Revert "2.21" 
This reverts commit eacbccd7db.
 2020-01-12 01:15:59 -05:00
RadiantFlash7
eacbccd7db 2.21 
Missed one.
I hate life.
 2020-01-11 23:09:59 -05:00
RadiantFlash7
08877da8ad 2.2 
Litterally, 1 space snuck into the variable, and ruined my perfect update.
 2020-01-11 23:06:50 -05:00
Repede
961160e169 Merge branch 'master' into master 2020-01-11 23:01:05 -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
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
Shadow
879ba15398 Re-Awooening 
Fix
 2020-01-11 12:04:40 -06:00
Shadow
a2804497b2 Howls 2020-01-11 02:27:30 -06:00
Repede
8bba624fe3 Merge branch 'master' into self 2020-01-07 23:54:34 -05:00
Repede
c343889525 Makes Teshari small boyes again, can thus be picked up by any and all crew. 2020-01-07 23:53:18 -05:00
TheFurryFeline
38c2c871d7 Copy-Pasta Fixy 
Fixes an oversight on bloodsucker_plus trait's apply proc.
 2020-01-06 14:39:53 -05:00
Hawk_v3
838f5e9418 Merge remote-tracking branch 'upstream/master' 2020-01-06 00:47:53 +00:00
Hawk-v3
8ecb7def83 Merge branch 'master' into master 2020-01-06 00:11:54 +00:00
Hawk_v3
717207490a Merge remote-tracking branch 'server/master' 2020-01-06 00:00:30 +00:00
Repede
c84b648214 Merge branch 'master' into izac 2020-01-05 18:51:47 -05:00
Heroman
e05fdf6258 Fixes clamp issues 2020-01-06 08:37:27 +10:00
RadiantFlash7
827e61e183 Proper syntax and commenting 
I'm not a smart dev.
 2020-01-05 11:21:34 -05:00
izac112
eef144f644 Never actually committed that not idea why tortis git thinks i did 
Revert "Actually puts them on the map"

This reverts commit fa23b4ad0c.
 2020-01-05 10:36:12 +01:00
Mechoid
c3079004ea GameMaster Tuning (#6593) 
* Actually Game Master but I am an idiot.
 2020-01-05 01:39:28 -05:00
RadiantFlash7
e26b48d335 Map fixes. 
Reduces RCD cost per use of mattercartridges.
Readds Fancy coffeeshop sign.
Re-adds Bluespace coffee.
Fixes bluespace coffee sprite and code.
Fixes access to rad shelter on sublevel 2,
Fixes space tiles in main level window of sec outpost,
Fixes SMES names and RCON names to be the same now.
Fixes Skydiving teleporter (Updated refractored code)
Removed extra APCs, and security cameras facing the wrong way.
Tries to fix Debris field teleporters (still don't understand why theres a second destination in the shuttle console. Halp.)
Increases explorer job slots. 2 is not 'nough.
Reduces efficiency of cooling loop for TEG. (Waiting on Izac's weakened TEGS for further update)
Buffs health of freezable airlocks, so spiders won't constantly destroy them so quick.
Fixes borked up wire connecting solars to main.
Fixes incorrect facing security camera in security.
Adds status displays to escape,
changes explorer limit from 5 to 3. (what was I thinking?)
Still an improvement over 2.
 2020-01-05 01:09:08 -05:00
izac112
c8bd2e78fa less efficient tegs at radiants request, can bump it down more if he like but have to keep in mind this thing is going to be running for 20 hours. 
Signed-off-by: izac112 <izac10@live.com>
 2020-01-04 19:21:16 +01:00
Heroman
489197990c Removes Poly's roundstart headset 2020-01-03 12:57:54 +10:00
Novacat
76f323984c Merge pull request #6373 from Verkister/ridewild 
Adds a verb for rideable mobs to toggle rider control without a riding crop
 2020-01-01 12:03:42 -05:00
Hawk_v3
8a0b78c322 Merge remote-tracking branch 'upstream/master' 2020-01-01 15:16:53 +00:00
Atermonera
0924159554 Merge pull request #6589 from Heroman3003/fruist-multispawn 
Allows admin spawning fruit in multiples
 2019-12-31 19:14:32 -05:00
Novacat
524ef9ee17 Merge pull request #6349 from Novacat/nova-basicfixes 
Misc Changes and bugfixes
 2019-12-31 18:39:10 -05:00
Novacat
a7551aea22 Merge pull request #6384 from Heroman3003/feral-bois 
Implements ferality indicator for xenochimera
 2019-12-31 11:43:51 -05:00
Novacat
df5b81c1b9 Merge pull request #6367 from lbnesquik/Kates-Taur-Clothes_3 
Introduce more taur clothes.
 2019-12-31 10:23:42 -05:00
Novacat
468e676779 Merge pull request #6325 from TheFurryFeline/TFF-Nose_Boopage! 
Boop Da Noses!
 2019-12-31 10:22:39 -05:00
Cebutris
b22008f01f i probably should have tried to compile this before making the PR but i'm not that smart 2019-12-31 05:06:37 -05:00
Cebutris
15a67e8141 We're not on Virgo anymore 2019-12-31 04:51:44 -05:00
Heroman
e21ac7d522 _vr 2019-12-31 15:42:15 +10:00
TheFurryFeline
50adcea491 Blep 
Big chunka text surrounded by Vorestation edit
 2019-12-30 16:41:02 -05:00
TheFurryFeline
8a63f28c78 Comment Consistency 2019-12-30 10:50:32 -05:00
lbnesquik
377723bcf4 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-30 09:09:51 +01:00