cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-04 06:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,262 Commits 7 Branches 0 Tags
e900aa66d174cb270f15738df36701aae37a73f6
Commit Graph

60262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Razgriz
e900aa66d1 Update survey_vendor.dm 2020-10-28 18:16:57 -07:00
Razgriz
d64eec25f1 Update equipment_vendor.dm 2020-10-28 18:15:56 -07:00
Chompstation Bot
94dbe7714c [MIRROR] Phoron bore utility improvements 2020-10-27 08:16:22 +00:00
Verkister
57adb0bfca Merge pull request #9207 from VOREStation/upstream-merge-7680 
[MIRROR] Phoron bore utility improvements
 2020-10-27 08:16:22 +00:00
CHOMPStationBot
a3f9f88bea Merge pull request #1 from CHOMPStation2/master 
Update
 2020-10-19 01:41:57 -07:00
Razgriz
332b83cc9b Merge pull request #602 from LunarFleet/Lun-Egg 
Only eggs can sustain me
 2020-10-16 04:09:21 -07:00
Razgriz
a72d1bf3d1 Merge pull request #597 from CHOMPStationBot/upstream-merge-9142 
[MIRROR] Add more gas to the fuel depot
 2020-10-15 22:39:40 -07:00
Razgriz
2e4c76a7ee Merge pull request #595 from CHOMPStationBot/upstream-merge-9186 
[MIRROR] Fixes double chair
 2020-10-15 22:38:30 -07:00
Razgriz
5b15055fad Merge pull request #591 from CHOMPStationBot/upstream-merge-9210 
[MIRROR] [MIRROR] Fix lighting with view rotation
 2020-10-15 22:35:31 -07:00
Razgriz
93bd3967d5 Merge pull request #588 from cadyn/gitbotsetup 
Keeping up to date with virgo in preparation for the upstream bot
 2020-10-15 22:32:55 -07:00
LunarFleet
bd1503a35d Realized I could touch up the interactions a bit 2020-10-15 23:37:26 -04:00
LunarFleet
2ecfe9c616 God please just work 2020-10-15 20:37:36 -04:00
LunarFleet
163dc56069 Only eggs can sustain me 2020-10-15 20:34:13 -04:00
Chompstation Bot
017fdce596 Add more gas to the fuel depot 2020-10-15 05:26:47 -07:00
Novacat
9f8503fa55 Merge pull request #9142 from Meghan-Rossi/fueldepotfix 
Add more gas to the fuel depot
 2020-10-15 05:26:47 -07:00
Chompstation Bot
957d80f8fa Fixes double chair 2020-10-15 05:26:29 -07:00
Novacat
a4e9519b0e Merge pull request #9186 from Heroman3003/mapfix3 
Fixes double chair
 2020-10-15 05:26:29 -07:00
Chompstation Bot
e4aefd85fb [MIRROR] Fix lighting with view rotation 2020-10-15 05:25:52 -07:00
Novacat
927acd6292 Merge pull request #9210 from VOREStation/upstream-merge-7692 
[MIRROR] Fix lighting with view rotation
 2020-10-15 05:25:52 -07:00
CHOMPStationBot
29d5037d5e Bot please work 2020-10-15 03:24:20 -07:00
Cadyn
213cec1dcc Reset map files. 2020-10-14 21:51:31 -07:00
Cadyn
77336c7c98 Finally setting up the PR bot 2020-10-14 21:14:38 -07:00
cadyn
55b4213166 Merge pull request #8 from CHOMPStation2/master 
yep
 2020-10-14 19:52:57 -07:00
Razgriz
b9e3c72caa Merge pull request #582 from cadyn/tguifix 
TGUI fix
 2020-10-14 18:39:00 -07:00
Novacat
2e782bfd50 Merge pull request #9218 from Meghan-Rossi/records 
Fix TGUI bluescreens for medical, security records
 2020-10-14 12:02:37 -04:00
Cadyn
3019393860 TGUI fix 2020-10-14 06:57:47 -07:00
Meghan-Rossi
666210215a Fix TGUI bluescreens for medical, security records 
Fixes https://github.com/VOREStation/VOREStation/issues/9214
 2020-10-14 12:33:52 +01:00
Razgriz
3a772c37ee Merge pull request #581 from cadyn/fixtgui 
Fix resleeving
 2020-10-13 17:18:08 -07:00
Cadyn
0935ab854e Travis is mean 2020-10-13 14:33:47 -07:00
Cadyn
dcc1c41b2b Resleeving fix 2020-10-13 13:44:32 -07:00
cadyn
50f9b0dcdf Merge pull request #7 from CHOMPStation2/master 
Updatum Forkum v2
 2020-10-13 07:58:26 -07:00
Razgriz
0942ad31ba Merge pull request #579 from MisterGrimm/Xenochanges1.1 
Xenomorph Balancing Act 1.1
 2020-10-12 23:58:07 -07:00
Razgriz
6ca7b15786 Merge pull request #580 from KasparoVy/i-wear-my-heart-on-my-sleeve 
Hearts on BOTH SLEEVES
 2020-10-12 23:33:22 -07:00
Razgriz
12e9248c8f Merge pull request #577 from ExabyteDiscord/remove-blatant-memes 
Removes loss POI, gnome, pufferfish and ack
 2020-10-12 23:32:43 -07:00
Razgriz
712fec09cb Merge pull request #578 from MisterGrimm/PredationChange 
Changes Brutal Predation ability name to Hard Vore
 2020-10-12 23:32:07 -07:00
Razgriz
defdd09f04 Merge pull request #576 from KasparoVy/overenswaggered 
Fixes Only One Accessory Equipped at Spawn & in Character Preview
 2020-10-12 23:01:24 -07:00
Novacat
4fc252cbae Merge pull request #9210 from VOREStation/upstream-merge-7692 
[MIRROR] Fix lighting with view rotation
 2020-10-12 18:58:24 -04:00
VirgoBot
ec48997721 Fix lighting with view rotation 2020-10-12 00:03:05 -04:00
Cyantime
845e14a0cb Fix lighting with view rotation (#7692) 2020-10-12 00:03:05 -04:00
Sym
c7480f8d61 Trying to placate Travis 2020-10-11 00:18:38 -04:00
Sym
04882a183d Travis you scoundrel 2020-10-10 23:55:46 -04:00
KasparoVy
a872b0dd8e I Wear my Heart on My Sleeve(s) 
Both of them.
 2020-10-10 23:17:47 -04:00
Sym
18bc6fb6e3 Xenomorph Balancing Act 1.1 
Simple balances and fixes due to a recent event.

- Changed plasma cost for laying eggs, from 75 to 200.

- Changed Agony damage of neurotoxin, from 80 to 60.

- Finally fixed the fact that xenomorphs cannot see in the dark. Xenomorphs can now see turfs and mobs, but lose some range when in the dark.

- Changed ability name Gut to Slaughter, to more accurately describe what it does.
 2020-10-10 21:27:48 -04:00
MisterGrimm
588f132ead Merge pull request #6 from CHOMPStation2/master 
Updoot 10/10/2020
 2020-10-10 11:49:42 -04:00
Sym
b7fbd1c584 Changes Brutal Predation ability name to Hard Vore 
Seriously, who thought it was a good idea to make the name of the Hard Vore ability to something obscure? This should make it a bit more obvious that you are going to literally eat someone's heart out if you use it.
 2020-10-09 12:33:56 -04:00
Novacat
af934395e1 Merge pull request #9196 from KillianKirilenko/kk-fixes 
Misc. Ship Fixes
 2020-10-08 23:05:41 -04:00
Novacat
911136ec89 Merge pull request #9199 from KasparoVy/overenswaggered 
[EARLYPORT] Fixes Only One Accessory Equipped at Spawn & in Character Preview
 2020-10-08 23:05:25 -04:00
Razgriz
561bc8faaa Merge pull request #575 from CHOMPStation2/Razgriz1032-patch-2 
Medichines HEV and synth Bitching Betty sounds
 2020-10-08 19:33:22 -07:00
Razgriz
253db5340b Do this later 
Figure out how to get the sounds to work for synths
 2020-10-08 18:47:01 -07:00
Erik
442b51117d Removes loss POI, gnome, pufferfish and ack 2020-10-08 17:55:03 -07:00