cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-05 23:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,517 Commits 7 Branches 0 Tags
ba05f70db60c6f91f1d472ff5fa7973880f59866
Commit Graph

36874 Commits

Author SHA1 Message Date
Hawk_v3
ba05f70db6 Merge remote-tracking branch 'upstream/master' 2020-01-13 18:37:42 +00:00
Novacat
d7962d0448 Merge pull request #6441 from Heroman3003/droppodfix 
Fixes droppod spawning wrong subtype
 2020-01-13 09:10:04 -05:00
Heroman3003
9e31d82dd5 Decreases chance 2020-01-13 18:16:46 +10:00
Heroman
f032c80486 Also buffs vore laws chance for lost voreborgs 2020-01-13 17:55:00 +10:00
Heroman
737d37321b Fixes droppod spawning wrong subtype 2020-01-13 17:48:33 +10:00
Novacat
fcd8fd1370 Merge pull request #6440 from Heroman3003/droppodfix 
Fixes drone droppod not being announced
 2020-01-13 02:04:30 -05:00
Heroman
aa53bdc0ed Fixes drone droppod not being announced 2020-01-13 16:51:12 +10:00
Novacat
c1a52de67b Merge pull request #6438 from Heroman3003/dronefix 
Makes drone age restriction based on config setting too
 2020-01-13 01:37:11 -05:00
Heroman
4551f97924 Makes drone age restriction based on config setting too 2020-01-13 14:56:27 +10:00
Novacat
c7b689246d Merge pull request #6423 from drexample/WE-ALWAYS-DELIVER 
DO YOU NEED A SLICE OF JOY IN YOUR LIFE?
 2020-01-12 22:14:17 -05:00
Novacat
105f13e03c Merge pull request #6424 from drexample/gnot-sure 
You've been gnomed.
 2020-01-12 22:02:41 -05:00
Novacat
7344a6f953 WE ALWAYS DELIVER!! 2020-01-12 22:02:04 -05:00
Hawk_v3
c51046191b Merge remote-tracking branch 'upstream/upstream-merge-6623' 2020-01-13 00:02:11 +00:00
Hawk_v3
20596d9787 Merge remote-tracking branch 'upstream/master' 2020-01-13 00:01:47 +00:00
Atermonera
b262b4ac96 Merge pull request #6623 from Heroman3003/radfix 
Fixes calculation of wall rad resistance
 2020-01-12 18:18:17 -05:00
Novacat
4068f95211 Merge pull request #6435 from Heroman3003/dronelimit 
Increases timegate for cyborgs to 3 days
 2020-01-12 17:20:29 -05:00
Heroman
eee8ecd2e5 Increases timegate for cyborgs to 3 2020-01-13 08:04:18 +10:00
Novacat
5e9b50c81f Merge pull request #6434 from Heroman3003/livepods 
Makes drone pods remain active after first attempt
 2020-01-12 17:04:00 -05:00
Novacat
0a58fb115c Merge pull request #6433 from Heroman3003/dronelimit 
Adds a timegate on playing maintenance drones
 2020-01-12 17:03:43 -05:00
Heroman
06b5064a8e Makes drone pods remain active after first attempt, allowing a ghost to click on it to enter 2020-01-13 07:21:48 +10:00
Heroman
de03c4e3e3 Adds a timegate on playing maintenance drones 2020-01-13 06:19:10 +10:00
Repede
e671d2d799 Merge branch 'master' into Howl'n 2020-01-12 14:36:47 -05:00
RadiantFlash7
cda5c1e3e3 YW comment eddits 
Proper commenting.
 2020-01-12 12:08:08 -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
8bbb074c08 I give up. 
Resets this file to default, because fuck everything apparently.
 2020-01-12 02:15:59 -05:00
RadiantFlash7
3338068d32 2.28 
Travis, My tears are full of salt.
Please accept them as an offering.
 2020-01-12 01:35:51 -05:00
RadiantFlash7
82937c85f4 2.whatever 
The only other thing I touched was this.
Surely that means it's this thats breaking it?
 2020-01-12 01:29:31 -05:00
RadiantFlash7
f749ac9d4c Revert "Revert "2.24"" 
This reverts commit 9e88c4f613.
 2020-01-12 01:20:47 -05:00
RadiantFlash7
239aff92fa Revert "Revert "fixing indentation error"" 
This reverts commit 0efe43dc44.
 2020-01-12 01:20:43 -05:00
RadiantFlash7
8b12d15cf3 Revert "Revert "2.22"" 
This reverts commit 484e80f9c8.
 2020-01-12 01:20:41 -05: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
484e80f9c8 Revert "2.22" 
This reverts commit e74d277ce5.
 2020-01-12 01:15:56 -05:00
RadiantFlash7
0efe43dc44 Revert "fixing indentation error" 
This reverts commit 3b021863b5.
 2020-01-12 01:15:53 -05:00
RadiantFlash7
9e88c4f613 Revert "2.24" 
This reverts commit 77217e2baa.
 2020-01-12 01:15:51 -05:00
RadiantFlash7
77217e2baa 2.24 
Please stop bitching at me travis ;-;
 2020-01-12 01:09:00 -05:00
RadiantFlash7
3b021863b5 fixing indentation error 
Iiis this the problem?
 2020-01-12 00:56:16 -05:00
RadiantFlash7
e74d277ce5 2.22 
I swear if this is the issue, i'ma cry.
 2020-01-12 00:39:20 -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