Razgriz
|
6f257b053b
|
Merge pull request #1259 from BlackMajor/vore-fix
Vore optimization and some
|
2021-02-12 20:21:05 -07:00 |
|
BlackMajor
|
02ade804ea
|
WAKE UP TRAVIS
|
2021-02-13 02:39:41 +13:00 |
|
Razgriz
|
aaee7ed0fd
|
Merge pull request #1214 from kcin2001/trash-eat-bots
Synths get a special list of Trash eat items and add a few items to normal trash eat
|
2021-02-11 22:39:44 -07:00 |
|
Razgriz
|
434e9a3891
|
Merge pull request #1161 from CHOMPStationBot/upstream-merge-9588
[MIRROR] Add in extra Ram horns.
|
2021-02-11 22:39:17 -07:00 |
|
Razgriz
|
5c7d335e2b
|
Revert "Revert #1240"
|
2021-02-08 17:36:28 -07:00 |
|
BlackMajor
|
c1bf8edaa6
|
some vore fixes
|
2021-02-08 22:01:29 +13:00 |
|
Razgriz
|
7313c4c3de
|
Revert Size traits #1240
#1240
|
2021-02-07 16:50:01 -07:00 |
|
Razgriz
|
314cf6f99f
|
Revert #1240
Revert #1240
|
2021-02-07 16:48:10 -07:00 |
|
cadyn
|
f3075eec21
|
wait istype should work more robustly here
|
2021-02-07 12:41:46 -08:00 |
|
cadyn
|
6818ee98df
|
Sanity check on loneliness traits
Just adding a sanity check to prevent some runtimes
|
2021-02-07 12:40:00 -08:00 |
|
Razgriz
|
c446790d4f
|
Merge pull request #1234 from cadyn/ballistics-v4
Ballistics v4
|
2021-02-06 22:59:44 -07:00 |
|
Razgriz
|
0869bf3824
|
Merge pull request #1244 from CHOMPStationBot/upstream-merge-9648
[MIRROR] Neuters Ambers
|
2021-02-06 18:11:09 -07:00 |
|
Novacat
|
af2a6c4baf
|
Merge pull request #9648 from VOREStation/Verkister-patch-8
Neuters Ambers
|
2021-02-07 00:28:57 +00:00 |
|
Cadyn
|
59f9c43a6d
|
Bugfix + Bolt-action sounds
|
2021-02-06 08:27:13 -08:00 |
|
cadyn
|
58e84bc354
|
Update neutral.dm
|
2021-02-06 07:26:46 -08:00 |
|
cadyn
|
5a6bb0d7c4
|
ohgodohfuck
|
2021-02-06 06:05:38 -08:00 |
|
Chompstation Bot
|
d1e1c62d1d
|
Adds body shape traits and proper preview scaling
|
2021-02-05 21:09:43 +00:00 |
|
Cadyn
|
5e9735fbac
|
Touching up everything.
|
2021-02-04 23:31:13 -08:00 |
|
Sym
|
9b69e4ab34
|
Clean the addition
Oh god I forgot to update the branch before I did all this stuff.
|
2021-02-05 00:16:11 -05:00 |
|
Sym
|
4c7e6796c6
|
Add battery lock
Makes it harder to BS void cells.
|
2021-02-05 00:09:13 -05:00 |
|
Sym
|
da52aa33cc
|
Updoot?
Oh god what is it doing
|
2021-02-05 00:02:34 -05:00 |
|
Sym
|
420a38a8c4
|
Balance 1.1, less damage
Reduce from 55 to 48.
|
2021-02-04 23:55:47 -05:00 |
|
cadyn
|
3bc058624e
|
Merge branch 'master' into Precursorpewpew
|
2021-02-04 20:49:25 -08:00 |
|
Sym
|
2d641fed65
|
Adds Precursor Projectile for alien guns
Replaces default cyan beam with new precursor beam, complete with new icon. Credit to Kassc for sprucing up the sprite.
|
2021-02-04 23:15:51 -05:00 |
|
Razgriz
|
14c7fcfef1
|
Merge branch 'master' into trash-eat-bots
|
2021-02-04 14:26:50 -07:00 |
|
Razgriz
|
8bf292d9c5
|
Merge pull request #1235 from Shadowfire117/ExtraMas
quick fix
|
2021-02-04 14:25:21 -07:00 |
|
Shadowfire
|
e0f0261727
|
quick fix
spelling errors, bleh
|
2021-02-04 21:30:10 +01:00 |
|
Cadyn
|
d93a3dac65
|
Ballistics v4
|
2021-02-04 01:56:16 -08:00 |
|
cadyn
|
6e569ca7de
|
Merge pull request #1209 from MisterGrimm/GammaJamma
Adds the GA-X Experimental Gamma Laser for mechs
|
2021-02-03 13:16:02 -08:00 |
|
cadyn
|
92b4eb2fd8
|
Merge pull request #1200 from LuciusWorna/master
Energy Weapons Rebalance and Misc Fixes
|
2021-02-03 13:15:50 -08:00 |
|
Razgriz
|
e15b227727
|
Merge pull request #1231 from CHOMPStationBot/upstream-merge-9639
[MIRROR] Fixes nontaur clipping
|
2021-02-03 09:56:24 -07:00 |
|
Razgriz
|
02b4e274ce
|
Merge pull request #1232 from Shadowfire117/ExtraMas
Shadyboi
|
2021-02-03 09:54:49 -07:00 |
|
Shadowfire
|
6716f5a01d
|
Shadyboi
Redacted
|
2021-02-03 17:37:07 +01:00 |
|
Novacat
|
a90aecfd90
|
Merge pull request #9639 from VOREStation/Verkister-patch-8
Fixes nontaur clipping
|
2021-02-03 14:40:17 +00:00 |
|
Razgriz
|
01e9a9a0ea
|
Merge pull request #1227 from CHOMPStationBot/upstream-merge-9637
[MIRROR] Disables egg contamination
|
2021-02-02 20:54:54 -07:00 |
|
Razgriz
|
8157fd7dd5
|
Merge pull request #1221 from CHOMPStationBot/upstream-merge-9622
[MIRROR] New advanced Egg Release mechanics.
|
2021-02-02 20:54:35 -07:00 |
|
Novacat
|
e047e9f98c
|
Merge pull request #9637 from VOREStation/Verkister-patch-6
Disables egg contamination
|
2021-02-03 02:17:13 +00:00 |
|
Nadyr
|
2b1b88b98b
|
Merge pull request #1219 from CHOMPStationBot/upstream-merge-9629
[MIRROR] Shuttle Console ID Stuff
|
2021-02-02 03:16:00 -05:00 |
|
Razgriz
|
bf259c4809
|
Merge pull request #1216 from Darlantanis/StarFireReportUpdate014-2565
Starfire Update 014 2565
|
2021-02-01 18:52:27 -07:00 |
|
Razgriz
|
505a6e1e7d
|
Merge pull request #1217 from CHOMPStationBot/upstream-merge-9628
[MIRROR] Includes subtles in Local Chat vchat filter
|
2021-02-01 18:51:38 -07:00 |
|
Razgriz
|
e414b036ab
|
Fix conflict and adds chomp comments to vorespawn_blacklist
|
2021-02-01 18:45:13 -07:00 |
|
Chompstation Bot
|
d3c7cc6040
|
New advanced Egg Release mechanics.
|
2021-02-01 19:35:41 +00:00 |
|
Novacat
|
3d5c11d6df
|
Merge pull request #9629 from Novacat/nova-basicfixes
Shuttle Console ID Stuff
|
2021-02-01 03:25:27 +00:00 |
|
Novacat
|
5509d68b91
|
Merge pull request #9626 from Verkister/shieldgenie
Fixes station shieldgen icon jank (supposedly)
|
2021-01-31 15:54:49 +00:00 |
|
Novacat
|
2de1f5aef0
|
Merge pull request #9628 from Cyantime/patch-5
Includes subtles in Local Chat vchat filter
|
2021-01-31 15:53:40 +00:00 |
|
Darlantan
|
5a588c5d99
|
News Update
|
2021-01-31 03:12:19 -05:00 |
|
kcin2001
|
dd066df7ae
|
forgot chomp add
|
2021-01-29 23:24:24 -08:00 |
|
Razgriz
|
710c6b5021
|
Merge pull request #1197 from CHOMPStationBot/upstream-merge-9615
[MIRROR] Converts Morph Spawn and Maint Pred events to use ghostpods
|
2021-01-30 00:20:38 -07:00 |
|
kcin2001
|
4318446c12
|
add synthetic check to trash eat
|
2021-01-29 23:19:04 -08:00 |
|
kcin2001
|
df711c9b89
|
trash eat stuff flavor text
|
2021-01-29 23:12:45 -08:00 |
|