Razgriz
|
4ad7c79c7f
|
Update ss13styles.css
|
2020-12-07 21:27:12 -07:00 |
|
Chompstation Bot
|
38bccdbfbd
|
Fixes Spacer language color
|
2020-12-02 20:41:27 +00:00 |
|
Razgriz
|
bbdeeede74
|
Merge pull request #954 from cadyn/newportals
Some simple portals for kassc
|
2020-11-30 23:58:33 -07:00 |
|
Razgriz
|
20b36b910d
|
Merge pull request #953 from CHOMPStationBot/upstream-merge-9382
[MIRROR] Add tintable doors
|
2020-11-30 23:57:15 -07:00 |
|
Razgriz
|
22edf0c71e
|
Merge pull request #952 from CHOMPStationBot/upstream-merge-9385
[MIRROR] fix da grass
|
2020-11-30 23:56:09 -07:00 |
|
Razgriz
|
02d4f0e3db
|
Merge pull request #951 from CHOMPStationBot/upstream-merge-9333
[MIRROR] Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
|
2020-11-30 23:55:06 -07:00 |
|
Razgriz
|
63170b9c8f
|
Merge pull request #948 from CHOMPStationBot/upstream-merge-9374
[MIRROR] Makes pixel shifting work with custom offsets
|
2020-11-30 23:20:13 -07:00 |
|
Razgriz
|
45a2edf42d
|
Merge pull request #949 from CHOMPStationBot/upstream-merge-9388
[MIRROR] Gurgled PDA ID floor drop fix, borgo belly edition
|
2020-11-30 23:19:41 -07:00 |
|
Razgriz
|
cf83958de7
|
Merge pull request #944 from CHOMPStationBot/upstream-merge-9378
[MIRROR] Greek Chiton
|
2020-11-30 23:18:42 -07:00 |
|
Razgriz
|
33ef2fcdc4
|
Merge pull request #943 from CHOMPStationBot/upstream-merge-9379
[MIRROR] Horned succubi
|
2020-11-30 23:17:58 -07:00 |
|
Razgriz
|
bc04558f0d
|
Merge pull request #940 from cadyn/fixtraits
Fix broken ass trait bullshit
|
2020-11-30 23:16:33 -07:00 |
|
Razgriz
|
d2a21b1315
|
Merge pull request #950 from CHOMPStation2/RazgrizBranch1
ohno
|
2020-11-30 23:13:51 -07:00 |
|
Cadyn
|
e1d970908f
|
Appease travis' replacement
|
2020-11-30 16:39:12 -08:00 |
|
Cadyn
|
9521b59193
|
Kassc portals :)
|
2020-11-30 16:24:46 -08:00 |
|
Novacat
|
438baf4c4b
|
Merge pull request #9382 from Little-119/tintable-doors
Add tintable doors
|
2020-11-30 23:47:30 +00:00 |
|
Novacat
|
3213d6458d
|
Merge pull request #9385 from Very-Soft/fixdagrass
fix da grass
|
2020-11-30 23:46:22 +00:00 |
|
Novacat
|
a9f77823d7
|
Merge pull request #9333 from Tenryumi/nikki-fluff
Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
|
2020-11-30 23:46:15 +00:00 |
|
Razgriz
|
6a38e02c0e
|
ohno
|
2020-11-30 15:20:28 -07:00 |
|
cadyn
|
26d1977857
|
Merge pull request #941 from cadyn/fixbullets
Ballistics v3.1 Balancing and fixes
|
2020-11-30 10:50:19 -08:00 |
|
cadyn
|
649b2c4aee
|
Merge branch 'master' into upstream-merge-9379
|
2020-11-30 10:31:07 -08:00 |
|
cadyn
|
c0d4e3625d
|
Resolve conflicts
|
2020-11-30 10:29:59 -08:00 |
|
cadyn
|
532e0ced11
|
Merge pull request #936 from CHOMPStationBot/upstream-merge-9372
[MIRROR] [MIRROR] Arm-Laser rebranding.
|
2020-11-30 10:26:29 -08:00 |
|
cadyn
|
170800542a
|
Merge pull request #909 from CHOMPStationBot/upstream-merge-9335
[MIRROR] Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching
|
2020-11-30 10:23:12 -08:00 |
|
Verkister
|
c1646df49b
|
Merge pull request #9388 from VOREStation/Verkister-patch-6
Gurgled PDA ID floor drop fix, borgo belly edition
|
2020-11-30 11:07:25 +00:00 |
|
Novacat
|
4c72df2720
|
Merge pull request #9374 from VOREStation/Verkister-patch-6
Makes pixel shifting work with custom offsets
|
2020-11-30 07:23:31 +00:00 |
|
Novacat
|
351b49203e
|
Merge pull request #9378 from dwinters99/ridge-wallet
Greek Chiton
|
2020-11-29 15:35:58 +00:00 |
|
Chompstation Bot
|
a4c8198479
|
Horned succubi
|
2020-11-29 15:35:52 +00:00 |
|
Cadyn
|
670017d41b
|
Ballistics v3.1
|
2020-11-29 04:51:18 -08:00 |
|
Cadyn
|
c69d43a3ed
|
Fix broken ass trait bullshit
|
2020-11-28 20:22:50 -08:00 |
|
Nadyr
|
d7e45f74bd
|
Merge pull request #937 from CHOMPStationBot/upstream-merge-9370
[MIRROR] [MIRROR] Fixes pointing going under mobs.
|
2020-11-28 05:31:47 -05:00 |
|
Nadyr
|
60ea7cbadc
|
Merge pull request #908 from CHOMPStationBot/upstream-merge-9351
[MIRROR] adjusts stage plane
|
2020-11-28 05:07:13 -05:00 |
|
Nadyr
|
e0ddf92c82
|
Merge pull request #907 from CHOMPStationBot/upstream-merge-9349
[MIRROR] More ship and turret fixes
|
2020-11-28 05:06:31 -05:00 |
|
Cadyn
|
a9fce95444
|
Fix ghost radio
|
2020-11-27 16:17:51 -08:00 |
|
Novacat
|
eac394142c
|
Merge pull request #9370 from VOREStation/upstream-merge-7755
[MIRROR] Fixes pointing going under mobs.
|
2020-11-27 23:11:36 +00:00 |
|
Novacat
|
95525fa8e4
|
Merge pull request #9372 from VOREStation/upstream-merge-7761
[MIRROR] Arm-Laser rebranding.
|
2020-11-27 23:11:28 +00:00 |
|
cadyn
|
16b4079be0
|
Merge pull request #917 from CHOMPStation2/RazgrizBranch1
Change frontier phaser beam-type to ACTUALLY BE a phaser
|
2020-11-25 22:42:15 -08:00 |
|
Cadyn
|
89b7b1d89a
|
Make phasers be orange like classic star trek :)
|
2020-11-25 22:40:59 -08:00 |
|
cadyn
|
97581dfcdf
|
Merge pull request #925 from CHOMPStationBot/upstream-merge-9362
[MIRROR] Prevent cyclic neighbor references in spreading plants
|
2020-11-25 20:24:12 -08:00 |
|
cadyn
|
855f42ec48
|
Fix conflicts
|
2020-11-25 20:22:48 -08:00 |
|
cadyn
|
e9b6e94fa2
|
Fix conflicts
|
2020-11-25 20:20:07 -08:00 |
|
cadyn
|
7e03ad469a
|
Merge pull request #926 from cadyn/taursprites
New Taur Sprites
|
2020-11-25 20:09:37 -08:00 |
|
Cadyn
|
49ae612dc4
|
Maybe forgot this
|
2020-11-25 19:44:55 -08:00 |
|
Cadyn
|
92acba8db0
|
New Taur Sprites
|
2020-11-25 18:39:54 -08:00 |
|
Novacat
|
f92c8d9fc4
|
Merge pull request #9362 from ShadowLarkens/patch-1
Prevent cyclic neighbor references in spreading plants
|
2020-11-25 21:50:11 +00:00 |
|
cadyn
|
f1c9b60bf8
|
Fuck okay maybe intercoms move sometimes
|
2020-11-24 23:24:36 -08:00 |
|
cadyn
|
d260757e91
|
yumyum radio go vroom hehe
|
2020-11-24 22:45:41 -08:00 |
|
Razgriz
|
e6a6c4267a
|
Remove mob class for replicant because that won't work
|
2020-11-24 18:10:53 -07:00 |
|
Razgriz
|
6c0e1fff3e
|
Add a mob class for replicant
Humanoid mob class.
|
2020-11-24 17:56:16 -07:00 |
|
Razgriz
|
39b810d0fc
|
And humanoids
Ok this should work for mercs as well
|
2020-11-24 17:28:09 -07:00 |
|
cadyn
|
21acd90c21
|
If the fixes the lag I will cry
|
2020-11-24 15:34:02 -08:00 |
|