kevinz000
|
7d192c305a
|
Merge pull request #9306 from kappa-sama/voidcell
Abductor batteries can be used to unlock abductor research
|
2019-09-21 01:39:08 -07:00 |
|
kevinz000
|
30fa8d8231
|
Merge pull request #9293 from Ghommie/Ghommie-cit195
leftover legcuffs/handcuffs overlays fix.
|
2019-09-21 01:38:14 -07:00 |
|
kevinz000
|
a9965d64b3
|
Merge pull request #9312 from Linzolle/ligament
ports ligament surgeries as well as dissection
|
2019-09-21 01:37:47 -07:00 |
|
YakumoChen
|
e297dbd0a3
|
Update energy_gun.dm
|
2019-09-21 02:39:47 +00:00 |
|
Sishen
|
43f39a75d6
|
Update runes.dm
|
2019-09-20 18:45:44 -04:00 |
|
Sishen
|
37d52239e3
|
Update runes.dm
|
2019-09-20 18:39:50 -04:00 |
|
Linzolle
|
deeceafb77
|
cult fixes
|
2019-09-20 16:38:37 -05:00 |
|
Ghommie
|
1f2c19c1da
|
ports "Resisting out of bucklecuffs takes an amount of time dependent on cuffs used", also toy handcuffs no longer demoralize the wearer.
|
2019-09-20 22:57:06 +02:00 |
|
Fermi
|
e6a5530363
|
Fixes
|
2019-09-20 20:06:38 +01:00 |
|
Ghommie
|
ec9bf9ed17
|
Ports sleepy pens and emagged borg cookies buffs, also buffing tirizene.
|
2019-09-20 19:04:28 +02:00 |
|
Ghommie
|
277f031143
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit147
|
2019-09-20 02:27:39 +02:00 |
|
Linzolle
|
573932437e
|
COMMA
|
2019-09-18 23:55:52 -05:00 |
|
Linzolle
|
cd2e894ebe
|
display results and wording
|
2019-09-18 23:51:35 -05:00 |
|
Linzolle
|
4bf9c8cc84
|
citadel fixes
|
2019-09-18 23:15:05 -05:00 |
|
XDTM
|
023428f6a4
|
port experimental dissection
|
2019-09-18 23:04:11 -05:00 |
|
XDTM
|
8ad11d7250
|
ports ligament surgeries
|
2019-09-18 22:55:46 -05:00 |
|
Fermi
|
df4da58ce8
|
Merge branch 'NeuroFix' of https://github.com/Thalpy/Citadel-Station-13 into NeuroFix
|
2019-09-19 01:46:32 +01:00 |
|
Fermi
|
08eeda97f5
|
Heck
|
2019-09-19 01:45:21 +01:00 |
|
Thalpy
|
18ce46d7ec
|
Merge branch 'master' into NeuroFix
|
2019-09-19 01:44:09 +01:00 |
|
BurgerLua
|
9003404ea8
|
Further tweak
|
2019-09-18 15:16:02 -07:00 |
|
BurgerLua
|
fe3117a006
|
Added Jetpack Tweaks
|
2019-09-18 14:49:00 -07:00 |
|
kappa-sama
|
34d109f6a2
|
on further thought, all of them
|
2019-09-18 17:12:06 -04:00 |
|
kappa-sama
|
9bdbf444e4
|
abductor batteries to tech tree
|
2019-09-18 17:09:24 -04:00 |
|
TrilbySpaceClone
|
5ecf68918b
|
tada
|
2019-09-18 03:47:52 -04:00 |
|
kevinz000
|
2cf1e6ff85
|
Merge pull request #9302 from deathride58/jobcodesanitychecks
fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks
|
2019-09-17 22:00:59 -07:00 |
|
Ghommie
|
8bf4d5754e
|
I'm a moron.
|
2019-09-18 04:23:52 +02:00 |
|
deathride58
|
18e97451a3
|
Merge branch 'master' into jobcodesanitychecks
|
2019-09-17 22:15:09 -04:00 |
|
Ghommie
|
abb8450e29
|
ninja shoes.
|
2019-09-18 04:07:51 +02:00 |
|
deathride58
|
d0296a5e81
|
fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks
|
2019-09-17 20:15:06 -04:00 |
|
Ghommie
|
150da1d34a
|
code quality
|
2019-09-18 01:37:17 +02:00 |
|
Ghommie
|
63fbf225a6
|
aaaaa
|
2019-09-18 01:24:44 +02:00 |
|
Ghommie
|
040b6472b4
|
FUCK
|
2019-09-18 01:21:18 +02:00 |
|
Ghommie
|
3ba5a2fd69
|
Fixes undershirts n socks colors.
|
2019-09-17 18:34:16 +02:00 |
|
Poojawa
|
6668630649
|
Merge branch 'master' into are-those-horns-are-are-you-just-retarded
|
2019-09-15 23:25:22 -05:00 |
|
BlackMajor
|
5a58ac6875
|
Merge pull request #9027 from Poojawa/job-menu-improvements
Job menu improvements Except maybe Kevin will merge it this time instead of a month later
|
2019-09-16 16:19:42 +12:00 |
|
Ghommie
|
f3a5e2e321
|
leftover legcuffs/handcuffs overlays fix.
|
2019-09-15 20:30:10 +02:00 |
|
Ghommie
|
300c572886
|
Added work boots and bananium clown shoes inhands, more fixes. ready.
|
2019-09-15 18:21:48 +02:00 |
|
Ghommie
|
89360c3574
|
Fixes clown shoes and work boots.
|
2019-09-15 17:56:20 +02:00 |
|
kevinz000
|
f3592a54a7
|
Merge pull request #9288 from Trilbyspaceclone/patch-227
Fixes orical UI being broken and taking modular files that are not a thing
|
2019-09-14 15:55:43 -07:00 |
|
Sishen
|
5159a58fef
|
Update strained_muscles.dm
|
2019-09-14 12:00:28 -04:00 |
|
Trilbyspaceclone
|
bad8a816ab
|
Update themed.dm
|
2019-09-14 06:51:19 -04:00 |
|
Poojawa
|
bf3d30c0e4
|
Seperates Insect fluff from wings
Fluff can be the new body markings I guess.
|
2019-09-14 04:27:38 -05:00 |
|
Poojawa
|
0417c0d6af
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-09-13 23:28:08 -05:00 |
|
Poojawa
|
0faafe8deb
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded
|
2019-09-13 23:26:27 -05:00 |
|
Poojawa
|
344ccaf20d
|
cleans up some other species related stuff, unmodularizes some code
|
2019-09-13 22:18:53 -05:00 |
|
Trilbyspaceclone
|
5b2dba354a
|
Merge branch 'master' into fruit
|
2019-09-13 14:00:11 -04:00 |
|
Poojawa
|
f0afc9c490
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-09-13 12:59:15 -05:00 |
|
Poojawa
|
9376bfb44d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into are-those-horns-are-are-you-just-retarded
|
2019-09-13 12:56:57 -05:00 |
|
kevinz000
|
39beca1a0f
|
Merge pull request #9199 from Tupinambis/IUsedTheShotgunYouKnowWhy
I Used The Shotgun, You Know Why? (Shotgun Balance Pass)
|
2019-09-13 10:47:15 -07:00 |
|
kevinz000
|
e107c51e19
|
Merge pull request #9241 from Linzolle/oracleui
Ports Oracle UI framework, and updates UI for paper and disposal bins.
|
2019-09-13 10:46:11 -07:00 |
|