 kevinz000
|
f686ea75d3
|
Merge pull request #8615 from Ghommie/Ghommie-cit45
Virtual reality componentization.
|
2019-10-10 02:09:51 -07:00 |
|
|
kevinz000
|
0c9a065096
|
Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
|
2019-10-10 02:09:37 -07:00 |
|
|
Ghommie
|
735755019e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-10-09 01:18:30 +02:00 |
|
|
Poojawa
|
3113074bfb
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-08 02:55:32 -05:00 |
|
|
GrayRachnid
|
9f8ad74bf9
|
New traumas and some other things.
|
2019-10-08 03:53:01 -04:00 |
|
|
kevinz000
|
dcb37bfd0e
|
Merge pull request #9418 from Ghommie/Ghommie-cit216
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
|
2019-10-07 23:36:11 -07:00 |
|
|
Linzolle
|
4bdd38b422
|
i feel like this is a really stupid way to fix it
|
2019-10-07 16:17:42 -05:00 |
|
|
Ghommie
|
31a6979c3c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54
|
2019-10-06 21:54:15 +02:00 |
|
|
Ghommie
|
cac4157894
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-10-05 22:03:37 +02:00 |
|
|
Ghommie
|
32a73b24c0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
|
2019-10-05 18:22:43 +02:00 |
|
|
Ghommie
|
3d22f4ec60
|
Porting a load of disease/symptoms code updates.
|
2019-10-05 07:14:25 +02:00 |
|
|
Fermi
|
79e85e2cfa
|
Fixes some runtimes
|
2019-10-04 03:53:02 +01:00 |
|
|
Ghommie
|
02df68a1cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-02 07:26:09 +02:00 |
|
|
Fermi
|
4b6d996416
|
Merge branch 'master' into Blind-quirk-without-anger
|
2019-10-01 08:41:12 +01:00 |
|
|
Fermi
|
89f3a01bc0
|
Merge branch 'master' into tg-Organ-port
|
2019-10-01 06:17:58 +01:00 |
|
|
Poojawa
|
117e5a409d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 00:05:44 -05:00 |
|
|
kevinz000
|
0febc1977a
|
Merge pull request #9191 from Linzolle/fireman
Ports fireman carrying from /tg/
|
2019-09-28 00:38:08 -07:00 |
|
|
Poojawa
|
f57bdc39a2
|
I still fucking hate components.
|
2019-09-23 02:03:37 -05:00 |
|
|
Ghommie
|
f449849bca
|
if
|
2019-09-22 19:06:34 +02:00 |
|
|
Ghommie
|
fc933ab7bb
|
setting durations.
|
2019-09-22 19:05:55 +02:00 |
|
|
Ghommie
|
9cc480a5eb
|
datum source.
|
2019-09-22 19:02:49 +02:00 |
|
|
Ghommie
|
3d0cb39e91
|
Removes revenant blight's shabby tox damage in favor of negative mood effects, and necropolis curse if not cured.
|
2019-09-22 18:42:47 +02:00 |
|
|
Poojawa
|
5876a235c2
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-22 00:22:18 -05:00 |
|
|
Fermi
|
97fa05f446
|
Merge branch 'master' into tg-Organ-port
|
2019-09-21 14:01:52 +01:00 |
|
|
Fermi
|
4b44b31aa3
|
Okay, feature done
|
2019-09-21 08:24:46 +01:00 |
|
|
Fermi
|
2b80998f64
|
Adds: cybernetic_heart_u and VV viewer.
|
2019-09-21 04:19:34 +01:00 |
|
|
skoglol
|
c1e84774ac
|
one-hand shit
|
2019-09-20 17:28:44 -05:00 |
|
|
Fermi
|
587568bf88
|
Merge branch 'master' into tg-Organ-port
|
2019-09-19 01:33:15 +01:00 |
|
|
Sishen
|
fa4f05b919
|
Update ert.dm
|
2019-09-18 20:13:12 -04:00 |
|
|
Fermi
|
dfa40a4b22
|
tg Code complete, now to bugtest and clear compile errors.
|
2019-09-18 23:57:21 +01:00 |
|
|
Fermi
|
c23d6f0113
|
I missed an earlier port.
|
2019-09-17 01:08:37 +01:00 |
|
|
Poojawa
|
fa7bf43ce7
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-16 17:44:10 -05:00 |
|
|
Ghommie
|
c813555697
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-09-15 04:05:14 +02:00 |
|
|
Poojawa
|
2250f0e516
|
Merge remote-tracking branch 'refs/remotes/origin/job-menu-improvements' into gen-poppers
|
2019-09-13 13:00:45 -05:00 |
|
|
Poojawa
|
fa364bbad0
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into gen-poppers
|
2019-09-13 13:00:29 -05:00 |
|
|
Poojawa
|
53895106dc
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-13 12:58:02 -05:00 |
|
|
Poojawa
|
8988d1e506
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-09-11 02:41:36 -05:00 |
|
|
Fermi
|
1e454ff1a7
|
Merge branch 'pr/25' into Blind-quirk-without-anger
|
2019-09-08 03:29:22 +01:00 |
|
|
kappa-sama
|
364d05e2b7
|
paxton going ape
|
2019-09-04 20:48:46 -04:00 |
|
|
kappa-sama
|
599634496e
|
paxton told me to do this or else he'd go ape
|
2019-09-04 20:46:50 -04:00 |
|
|
kappa-sama
|
876232c1bc
|
cultist boot cultist boot?
|
2019-09-04 20:38:51 -04:00 |
|
|
nik707
|
3ea520d443
|
Merge pull request #8649 from Ghommie/Ghommie-cit50
Increases the default space ruin z-level count to 2
|
2019-09-02 18:25:30 -05:00 |
|
|
Ghommie
|
2a7b802957
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-08-29 21:01:23 +02:00 |
|
|
nik707
|
9a0b6a21f9
|
Merge pull request #8904 from Citadel-Station-13/kevinz000-patch-64
Amber alert ERTs no longer get pulse weapons
|
2019-08-28 13:05:56 -05:00 |
|
|
BlackMajor
|
4d6b9f5da1
|
Merge pull request #8537 from Ghommie/Ghommie-cit28
Fixes emags wasting charges on un-emaggable stuff.
|
2019-08-28 13:54:03 +12:00 |
|
|
kevinz000
|
1e6845491d
|
Update mood.dm
|
2019-08-26 19:54:34 -07:00 |
|
|
kevinz000
|
0eb1fdd9dc
|
Update mood.dm
|
2019-08-25 11:19:01 -07:00 |
|
|
Linzolle
|
14ba00d477
|
shakes my head
|
2019-08-24 22:21:46 -05:00 |
|
|
Rob Bailey
|
5e94a5db80
|
ports #44155 from /tg/station
|
2019-08-24 20:21:44 -05:00 |
|
|
Ghommie
|
24fe7126c4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28
|
2019-08-24 19:05:51 +02:00 |
|