timothyteakettle
|
584e74590f
|
port1
|
2020-07-17 02:01:33 +01:00 |
|
Putnam
|
8458f97692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-05-12 13:34:31 -07:00 |
|
kevinz000
|
395d434e6e
|
Merge pull request #12200 from Ghommie/Ghommie-cit738
nutrition adjustment wrapper procs from tg.
|
2020-05-12 12:28:02 -07:00 |
|
Putnam
|
f4f80594bd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real
|
2020-05-11 17:10:55 -07:00 |
|
Putnam
|
e8d7da56f4
|
Ported C++mos from yogs (help me)
|
2020-05-11 15:44:26 -07:00 |
|
kevinz000
|
1cf2311930
|
Merge pull request #12164 from Ghommie/Ghommie-cit733
Porting "Refactors language holder"
|
2020-05-10 14:16:42 -07:00 |
|
Ghommie
|
667c12d413
|
nutrition adjustment wrapper procs.
|
2020-05-10 21:41:50 +02:00 |
|
Putnam3145
|
3531459d8b
|
Some trauma rebalancing (#12144)
* Some trauma rebalancing.
* Wow I didn't actually commit the 50% change
* when did i stop compiling before pushing
|
2020-05-09 01:42:39 +02:00 |
|
Ghommie
|
2858ddd90b
|
Porting "Refactors language holder"
|
2020-05-08 22:44:02 +02:00 |
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
kevinz000
|
b8642c5622
|
Merge pull request #11424 from necromanceranne/death_coma_stuff
Some fakedeath fixes requested by kev also ports a fix from tg to regen coma
|
2020-03-11 17:24:03 -07:00 |
|
necromanceranne
|
c37d30a617
|
Some fixes requested by kev also ports a fix from tg
|
2020-03-11 15:43:47 +11:00 |
|
Seris02
|
cccd0e9eef
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-03-09 16:49:32 +08:00 |
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
Ghommie
|
c0ff43f827
|
ofc, New arguments.
|
2020-03-01 16:34:43 +01:00 |
|
Seris02
|
c3ec44b0d0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-02-22 19:54:10 +08:00 |
|
kevinz000
|
a784a74ccb
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 13:35:26 -07:00 |
|
Unknown
|
c920d198e2
|
Update Viro to /tg/ standards
|
2020-02-19 12:17:57 -05:00 |
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
Seris02
|
2d9c8ce8fc
|
fixing merge conflicts
|
2020-02-15 15:41:52 +08:00 |
|
Artur
|
7964d768fa
|
Initial Commit
|
2020-02-13 20:51:52 +02:00 |
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
Artur
|
816f94bd61
|
pandemic fixes
|
2020-02-10 10:20:57 +02:00 |
|
Seris02
|
ee7064840d
|
merge conflicts fixed finally
|
2020-02-05 18:42:16 +08:00 |
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
kevinz000
|
275b1f73e0
|
Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-04 03:39:14 -07:00 |
|
Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
Ghommie
|
8de11845d5
|
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-02 03:39:49 +01:00 |
|
IronEleven
|
fa7b38d3bd
|
Stat Changes
Changes symptom stats to match tg
|
2020-01-31 19:03:30 -05:00 |
|
IronEleven
|
d2e6f4abf0
|
Comment Typo Fix
Might as well fix that while I'm in here
|
2020-01-31 19:02:59 -05:00 |
|
Arturlang
|
83ce84cdc4
|
Merge branch 'master' into TGUIs_Nexties
|
2020-01-30 20:46:20 +02:00 |
|
kevinz000
|
3bf0e1d5c4
|
Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
|
2020-01-28 17:57:26 -07:00 |
|
kevinz000
|
611fd7ea89
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-27 23:35:35 -07:00 |
|
Ghommie
|
f6beadb494
|
missed this little one.
|
2020-01-24 23:45:50 +01:00 |
|
Seris02
|
5499638c5e
|
yes
|
2020-01-23 15:41:49 +08:00 |
|
Artur
|
8b21a60ac9
|
MF Line endings
|
2020-01-20 14:09:22 +02:00 |
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
kevinz000
|
9ef4cbfa76
|
refactor tags
|
2020-01-16 20:58:00 -07:00 |
|
Artur
|
8b8a112d2c
|
Ohkay
|
2020-01-15 09:41:33 +02:00 |
|
Seris02
|
16b5c83a3a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-01-13 12:53:52 +08:00 |
|
kevinz000
|
b341818f04
|
mobility flags
|
2020-01-12 11:00:12 -08:00 |
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
Seris02
|
ac4489c6a8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-01-11 13:55:29 +08:00 |
|
Seris02
|
862acf2f06
|
ports hyper's genetics
|
2019-12-28 21:33:15 +08:00 |
|
Ghommie
|
e74339ce8b
|
Jfc that's a lot of work!
|
2019-12-23 04:24:13 +01:00 |
|
Putnam
|
9506a78429
|
whoops replaced this var with a simpler check
|
2019-11-01 18:46:31 -07:00 |
|
Putnam
|
bb197c2251
|
allows heal viruses not to hurt slimes
|
2019-10-30 01:34:03 -07: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 |
|
Ghommie
|
3d22f4ec60
|
Porting a load of disease/symptoms code updates.
|
2019-10-05 07:14:25 +02:00 |
|
Fermi
|
dfa40a4b22
|
tg Code complete, now to bugtest and clear compile errors.
|
2019-09-18 23:57:21 +01:00 |
|