Razgriz
71b5f2f4cd
Enable Maintenance Predator
...
While I'm at it fixing this PR, I will enable this as like a fun thingy for people to mess with.
2020-11-17 04:19:31 -07:00
Razgriz
d10f1b8331
Update maintenance_predator_vr.dm
2020-11-17 04:15:20 -07:00
Chompstation Bot
38beda4a2a
Fixes maintpred hyperspeed.
2020-11-16 02:18:57 +00:00
cadyn
8c59263e72
Update robolimbs_vr.dm
2020-11-15 16:26:22 -08:00
cadyn
9234b847af
Make it more clear.
2020-11-15 16:24:55 -08:00
Razgriz
5afa72a83e
Merge pull request #844 from CHOMPStation2/metroid
...
Current Metroid Progress
2020-11-15 13:59:33 -07:00
Verkister
e612636a10
Merge pull request #9309 from VOREStation/Verkister-patch-5
...
Fixes pixel shifting breaking offsets
2020-11-15 19:08:13 +00:00
cadyn
fea581f4ea
Merge pull request #842 from CHOMPStationBot/upstream-merge-9132
...
[MIRROR] Change from iMessage style to Tinder style messaging
2020-11-15 02:23:57 -08:00
cadyn
e22d99d936
Merge pull request #847 from CHOMPStationBot/upstream-merge-9298
...
[MIRROR] Adds Crescent-Moon Hair by Piperboobear
2020-11-15 02:09:07 -08:00
cadyn
d75c393d2f
Merge pull request #846 from CHOMPStationBot/upstream-merge-9307
...
[MIRROR] Ports CitRP Protogen Head + Markings, Some Vox Markings, Teshari Markings, Ears + Tailss
2020-11-15 02:08:13 -08:00
cadyn
1db7b1d2e6
Merge pull request #845 from CHOMPStationBot/upstream-merge-9304
...
[MIRROR] Balance fixes and bugfixes
2020-11-15 02:07:40 -08:00
Cadyn
4183f92f2a
Building TGUI
2020-11-15 01:58:16 -08:00
cadyn
93ad7eab9a
Merge pull request #838 from CHOMPStationBot/upstream-merge-8848
...
[MIRROR] Remove gravity from debris field and rogue mining zones
2020-11-15 00:57:51 -08:00
cadyn
d2a2b301cc
Merge pull request #829 from cadyn/traits-v2
...
Cadyn's traits v2
2020-11-15 00:54:35 -08:00
cadyn
a1db30bac7
Merge pull request #848 from CHOMPStation2/master
...
Fixing raz's PR lol
2020-11-15 00:52:09 -08:00
cadyn
a67c751841
Merge branch 'master' into upstream-merge-9307
2020-11-15 00:48:22 -08:00
Verkister
f5c125eaff
Merge pull request #9298 from Tenryumi/piper-hair
...
Adds Crescent-Moon Hair by Piperboobear
2020-11-15 08:46:24 +00:00
Chompstation Bot
f932e65178
Ports CitRP Protogen Head + Markings, Some Vox Markings, Teshari Markings, Ears + Tailss
2020-11-15 08:44:14 +00:00
Nadyr
56f2c6f408
Merge pull request #836 from cadyn/newreflectors
...
New, improved, reflector turrets
2020-11-14 22:16:03 -05:00
Razgriz
02d51b5756
Merge branch 'master' into metroid
2020-11-14 15:25:04 -07:00
Novacat
1efc4bcd9f
Merge pull request #9304 from Novacat/nova-basicfixes
...
Balance fixes and bugfixes
2020-11-14 17:54:59 +00:00
Razgriz
f70d48cfce
Update Metroid Progress
2020-11-14 04:17:46 -07:00
Razgriz
cd71309e32
Add files via upload
2020-11-14 04:12:57 -07:00
cadyn
b4a9632e16
Add logging for adrenaline rush being activated.
2020-11-13 22:54:02 -08:00
Novacat
49ef2d2ee9
Merge pull request #8848 from Cyantime/spaceweirdness
...
Remove gravity from debris field and rogue mining zones
2020-11-14 06:49:05 +00:00
cadyn
33a411e662
Feedbaaack
2020-11-13 22:46:58 -08:00
Cadyn
9efa4251ca
Spicy Engineering :o
2020-11-13 04:35:15 -08:00
Razgriz
a9b48f90b2
Change OOC Escape message
...
Because old message is crap and OOC Escape is great for escaping stupid mobs because vore mechanics in combat is a meme, and with other people consent is important. You should never feel threatened or intimidated to press this button.
2020-11-13 02:59:24 -07:00
Razgriz
8e8ae7229e
Merge pull request #826 from r4d6/patch-1
...
Allow Phase Weaponry to be printed again.
2020-11-13 00:35:34 -07:00
cadyn
6c01fa902d
swapped some numbers by mistake :p
2020-11-12 00:39:28 -08:00
Razgriz
e4e0b08da6
Merge pull request #788 from cadyn/ballistics-v2
...
Ballistics v2
2020-11-11 19:32:40 -07:00
Razgriz
2e94257252
Merge pull request #777 from cadyn/gunoverhaul
...
Cadyn's ballistics overhauls part 1
2020-11-11 19:32:20 -07:00
Razgriz
0e07c9a739
Merge pull request #824 from r4d6/cigar
...
Add cigar cases to the loadout
2020-11-11 19:30:25 -07:00
Razgriz
c0ebd7d70a
Merge pull request #821 from CHOMPStationBot/upstream-merge-9293
...
[MIRROR] Couple little borgo belly tweaks.
2020-11-11 19:30:07 -07:00
Razgriz
65bea48122
Merge pull request #820 from CHOMPStationBot/upstream-merge-9288
...
[MIRROR] [MIRROR] Adds the Frostbelle
2020-11-11 19:16:05 -07:00
Razgriz
4545f66e7c
Update dog_sleeper_vr.dm
2020-11-11 19:12:11 -07:00
Cadyn
6d5c74aa3c
forgot the </span> oops
2020-11-11 13:55:57 -08:00
Cadyn
6d35d3f025
4.0 slowdown instead of 2.0
2020-11-11 13:46:09 -08:00
Cadyn
953b47764c
Cadyn's traits v2
2020-11-11 12:34:31 -08:00
cadyn
29645e04e1
adding #ifndef for gaussian_random
2020-11-10 15:15:16 -08:00
r4d6
e4f101a670
Uncomment Phase Weaponry
...
Phase Weaponry can be printed again.
2020-11-10 12:34:52 -05:00
r4d6
18673505f6
Another move.
2020-11-10 00:06:36 -05:00
r4d6
60215f5b7e
Merge branch 'cigar' of https://github.com/r4d6/CHOMPStation2 into cigar
2020-11-10 00:05:47 -05:00
r4d6
d628ce8ff4
Move the cigar cases to a new _ch file
2020-11-10 00:04:17 -05:00
r4d6
8b91ad3a37
Add chomp edits
2020-11-09 23:48:19 -05:00
r4d6
d0cbf7f856
Add cigar cases to the loadout.
2020-11-09 19:23:00 -05:00
Razgriz
94f3d8f591
Merge pull request #823 from cadyn/quicknifboys2
...
give mods quick nif privvys
2020-11-09 15:26:15 -07:00
cadyn
2486a483c8
give mods quick nif privvys
2020-11-09 10:47:57 -08:00
Razgriz
5d1977b324
Merge pull request #817 from CHOMPStationBot/upstream-merge-9287
...
[MIRROR] [MIRROR] Fresh Meat, Leatherworking
2020-11-08 23:41:34 -07:00
Razgriz
5cf20997f0
Merge pull request #816 from CHOMPStationBot/upstream-merge-9290
...
[MIRROR] [MIRROR] Ports some clothing from uristcode
2020-11-08 17:16:46 -07:00
