TrilbySpaceClone
|
c5cac186fc
|
bad notes bgone
|
2019-12-15 01:50:57 -05:00 |
|
TrilbySpaceClone
|
32cbe8588e
|
fogot the beest one
|
2019-12-15 01:15:55 -05:00 |
|
TrilbySpaceClone
|
5febc54fb8
|
whats all the buzz around this new drink?
|
2019-12-15 01:13:15 -05:00 |
|
Putnam3145
|
2e9503f6d7
|
Merge pull request #10166 from Ghommie/Ghommie-cit457
Ports "Roundstart borg brains no longer decay."
|
2019-12-14 20:37:57 -08:00 |
|
Lin
|
cce63507d1
|
Merge pull request #9970 from Ghommie/Ghommie-cit402
they're pretty bad, I'm not sure how these actually got in actually. thanks kevin
|
2019-12-15 00:16:34 +00:00 |
|
Unknown
|
73abc2ae40
|
Merge branch 'master' into xantholne-christmas01
|
2019-12-14 17:15:00 -07:00 |
|
Lin
|
49c37641a7
|
Merge pull request #10122 from Citadel-Station-13/kevinz000-patch-124
nerfs factorio (conveyors can no longer stack more than 150 items on one tile)
|
2019-12-15 00:04:58 +00:00 |
|
Lin
|
1f852ea92a
|
Merge pull request #10150 from Trilbyspaceclone/patch-245
Corrects telegram hat icon, adds a new dog fashion to telegram hat
|
2019-12-15 00:02:57 +00:00 |
|
Ghommie
|
081d3df750
|
This is one serious Pepe Silvia complex.
|
2019-12-14 22:52:40 +01:00 |
|
Putnam3145
|
bd1040ab60
|
Merge pull request #10171 from r4d6/patch-1
Who the fuck put 10 shielding when you need 9?
|
2019-12-14 11:04:37 -08:00 |
|
Ghommie
|
12b87b4f3d
|
Better.
|
2019-12-14 19:29:51 +01:00 |
|
Ghommie
|
2ccfaf38fb
|
consistency.
|
2019-12-14 19:27:39 +01:00 |
|
Ghommie
|
6117434c7f
|
Ok
|
2019-12-14 19:24:43 +01:00 |
|
Ghommie
|
70252d2914
|
Fixing a few pill bottle issues with the ChemMaster.
|
2019-12-14 19:20:02 +01:00 |
|
Artur
|
6124fbf316
|
Hopefully this fixes the linter errors
|
2019-12-14 19:04:36 +02:00 |
|
Ghommie
|
3891c91799
|
virtual reality component improvements, fixes and documentation.
|
2019-12-14 17:19:48 +01:00 |
|
Artur
|
d0493ac471
|
Reviewer and linter fixes, and veil tweak
|
2019-12-14 17:09:39 +02:00 |
|
BlackMajor
|
59d0376985
|
finished
|
2019-12-14 17:31:26 +13:00 |
|
Hatterhat
|
a1cc129d0b
|
slightly better storage, cucks the surgery duffel
|
2019-12-13 21:10:12 -06:00 |
|
kevinz000
|
659b78d8b8
|
Merge pull request #10162 from BlackMajor/Yeehaw
Removes medihounds (actually just makes them a medical aux sprite)
|
2019-12-13 16:52:22 -07:00 |
|
Artur
|
9faf3d1dac
|
Mooaar fixeees
|
2019-12-14 01:01:38 +02:00 |
|
Ghommie
|
b39ae815f3
|
Porting several quirks code updates.
|
2019-12-13 16:12:04 +01:00 |
|
r4d6
|
5f95e0d5a6
|
Remove an extra antimatter engine shielding
|
2019-12-13 08:17:06 -05:00 |
|
BlackMajor
|
2bf35ec81c
|
Nuclear fist
|
2019-12-14 02:15:09 +13:00 |
|
Ghommie
|
2611023488
|
Ports "Roundstart borg brains no longer decay."
|
2019-12-13 07:33:45 +01:00 |
|
nik707
|
cdeb4733aa
|
Merge pull request #9863 from BlackMajor/Yote
No adrenals for borgs please
|
2019-12-12 23:50:34 -06:00 |
|
Ghommie
|
c098d497ad
|
Minor underwear fixes and tweaks.
|
2019-12-13 06:50:14 +01:00 |
|
kappa-sama
|
93c4d3c1af
|
martial artists
|
2019-12-12 23:27:12 -05:00 |
|
Trilbyspaceclone
|
285833c8d3
|
Runtime fix
|
2019-12-12 21:51:50 -05:00 |
|
Trilbyspaceclone
|
658e050b1f
|
Ghommie correction
|
2019-12-12 21:47:54 -05:00 |
|
Trilbyspaceclone
|
e6282e95c2
|
Apply suggestions from code review
Ghommie fixes
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-12 21:46:31 -05:00 |
|
Ghommie
|
79328012b0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit402
|
2019-12-13 03:41:22 +01:00 |
|
Ghommie
|
563a0fef3c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit390
|
2019-12-13 02:45:53 +01:00 |
|
Ghommie
|
284202a092
|
two lines.
|
2019-12-13 02:37:51 +01:00 |
|
Ghommie
|
7d7bcc7c34
|
Fixes and ready up.
|
2019-12-13 02:30:21 +01:00 |
|
Ghommie
|
3fcb7808fd
|
args
|
2019-12-13 02:30:17 +01:00 |
|
Ghommie
|
8ec4bdaef5
|
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2019-12-13 02:30:11 +01:00 |
|
BlackMajor
|
83a707ee93
|
Removes medihounds, same treatment as janihounds
|
2019-12-13 13:48:22 +13:00 |
|
Ghommie
|
4502d7b795
|
Ports improved and simplier fire alarms.
|
2019-12-12 22:44:20 +01:00 |
|
BlackMajor
|
725414bd03
|
Merge pull request #9894 from Putnam3145/real-explosion-fix
[TESTMERGE] Explosion/bomb armor rework
|
2019-12-13 10:20:33 +13:00 |
|
Putnam3145
|
71b2754aa6
|
Merge pull request #10121 from kappa-sama/patch-12
plasmafist wizard plasmafist wizard
|
2019-12-12 12:28:49 -08:00 |
|
Putnam3145
|
9234876ad1
|
Merge pull request #10156 from Ghommie/Ghommie-cit451
Fixing character setup preview icons.
|
2019-12-12 09:30:34 -08:00 |
|
Ghommie
|
bc2e6a7f9b
|
Ports "Fixes powernet avail checks"
|
2019-12-12 17:35:35 +01:00 |
|
Ghommie
|
3545f10137
|
Fixing character setup preview icons.
|
2019-12-12 17:04:14 +01:00 |
|
Seris02
|
7b75612ad1
|
woops
|
2019-12-12 19:21:23 +08:00 |
|
Seris02
|
f565c1cd3c
|
adds some distance checks
|
2019-12-12 18:48:25 +08:00 |
|
Linzolle
|
acffa683c9
|
clearer message?
|
2019-12-12 00:40:08 -06:00 |
|
Lin
|
a4d52454db
|
Merge pull request #10085 from Ghommie/Ghommie-cit440
Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago.
|
2019-12-12 02:13:54 +00:00 |
|
kappa-sama
|
b89d04884e
|
indents oops
|
2019-12-11 17:23:00 -05:00 |
|
kappa-sama
|
2b8f81bca3
|
idk maybe
|
2019-12-11 17:22:14 -05:00 |
|