 Cebutris
|
df136ab96c
|
lactation is now a preference
|
2019-08-10 23:28:16 -04:00 |
|
|
Sishen
|
4ba3d851ed
|
IT JUST WORKS
|
2019-08-09 00:46:14 -04:00 |
|
|
kevinz000
|
65473dc4ba
|
s
|
2019-08-07 13:18:45 -07:00 |
|
|
kevinz000
|
277971971f
|
s
|
2019-08-07 13:07:38 -07:00 |
|
|
Poojawa
|
3499d73f6b
|
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
|
2019-07-31 19:24:39 -05:00 |
|
|
Poojawa
|
8c63ea7b6d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-07-26 17:36:46 -05:00 |
|
|
Ghommie
|
56f2a8f884
|
Fixes oversized tennis balls, testing and fixing.
|
2019-07-25 04:29:21 +02:00 |
|
|
Ghommie
|
fd2f2ae1af
|
update, bitflags.
|
2019-07-23 07:21:03 +02:00 |
|
|
Ghommie
|
3bd0ba0275
|
Cleaning up Arousal code & co.
|
2019-07-23 06:39:53 +02:00 |
|
|
Thalpy
|
15ab1a26a4
|
Merge branch 'master' into master
|
2019-07-21 01:50:41 +01:00 |
|
|
BurgerLua
|
9d183beb9c
|
Added
|
2019-07-17 18:15:55 -07:00 |
|
|
Ghommie
|
b818b1eedd
|
Updating spraycans and crayons code.
|
2019-07-17 15:45:48 +02:00 |
|
|
Thalpy
|
9c7b1dee97
|
Merge branch 'master' into master
|
2019-07-15 21:23:04 +01:00 |
|
|
Ghommie
|
4df4cbd721
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-07-15 17:23:01 +02:00 |
|
|
kevinz000
|
628244c0ba
|
Merge pull request #8869 from Ghommie/Ghommie-cit129
Ports "Show codewords on round end screen"
|
2019-07-14 14:49:11 -07:00 |
|
|
Thalpy
|
f77bcc9765
|
Merge branch 'master' into master
|
2019-07-14 15:10:32 +01:00 |
|
|
kevinz000
|
b153294a24
|
Merge pull request #8857 from Ghommie/Ghoomie-cit127
Refactoring underwear to allow custom color preferences.
|
2019-07-14 03:38:45 -07:00 |
|
|
Thalpy
|
4c4dbd0e17
|
Merge branch 'master' into master
|
2019-07-13 19:33:46 +01:00 |
|
|
kevinz000
|
e5d445c4d3
|
Merge pull request #8846 from Ghommie/Ghommie-cit122
Rubber toolboxes.
|
2019-07-12 07:35:25 -07:00 |
|
|
kevinz000
|
1eaddd3ebf
|
Merge pull request #8853 from Ghommie/Ghommie-cit125
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
|
2019-07-12 07:34:19 -07:00 |
|
|
Ghommie
|
bef0027287
|
In a haste, we forget thousand things.
|
2019-07-11 08:50:47 +02:00 |
|
|
Ghommie
|
143410c176
|
Blame Poojawa for the issue.
|
2019-07-11 07:39:29 +02:00 |
|
|
Poojawa
|
c4f736eb94
|
Merge branch 'master' into job-menu-improvements
|
2019-07-10 18:55:29 -05:00 |
|
|
Ghommie
|
ba7c24a0ec
|
Refactoring underwear to allow custom color preferences.
|
2019-07-09 23:25:54 +02:00 |
|
|
Ghommie
|
490ae9daf2
|
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
|
2019-07-09 07:58:22 +02:00 |
|
|
Thalpy
|
c418312cc6
|
Merge branch 'master' into master
|
2019-07-09 05:33:09 +01:00 |
|
|
deathride58
|
42cee552fe
|
Merge pull request #8709 from Trilbyspaceclone/Fel_port_1
Ports "Fixes every issue in the slimes milestone. #44450"
|
2019-07-08 18:10:46 -04:00 |
|
|
Ghommie
|
9043402483
|
Rubber toolboxes.
|
2019-07-08 14:34:14 +02:00 |
|
|
Poojawa
|
f66ee6f967
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
|
2019-07-04 00:44:29 -05:00 |
|
|
Ghommie
|
a3ab5f6d23
|
Moving the snowflake mob var to the component and finalizing.
|
2019-07-04 02:03:51 +02:00 |
|
|
Ghommie
|
c58efa64c1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-07-03 02:36:23 +02:00 |
|
|
Thalpy
|
696d879874
|
Merge branch 'master' into master
|
2019-06-29 15:48:25 +01:00 |
|
|
Poojawa
|
00a630abe5
|
Fixes errant ball behaviour
|
2019-06-26 07:42:02 -05:00 |
|
|
Fermi
|
3928e027b4
|
Fixes (see dev discussion)
|
2019-06-25 23:06:55 +01:00 |
|
|
Fermi
|
10109d0fe5
|
Merge branch 'pr/18'
|
2019-06-23 19:15:07 +01:00 |
|
|
kevinz000
|
c9d67ecd49
|
Merge pull request #8667 from Ghommie/Ghommie-cit61
Ports the system for randomized semi-persistent chem reactions.
|
2019-06-23 06:54:43 -07:00 |
|
|
kevinz000
|
294e1e48d2
|
Merge pull request #8659 from Ghommie/Ghommie-cit57
ports "Componentizes orbiting"
|
2019-06-23 06:50:32 -07:00 |
|
|
TrilbySpaseClone
|
771ac9724e
|
ports Fel connet
Shamelessly stealing content
|
2019-06-21 04:39:10 -04:00 |
|
|
Thalpy
|
41eee65b15
|
Merge branch 'master' into master
|
2019-06-17 12:18:40 +01:00 |
|
|
Ghommie
|
6f03ac192b
|
I read it wrong.
|
2019-06-17 10:57:59 +02:00 |
|
|
Ghommie
|
50dd512be7
|
Ports system for randomized semi-persistent chem reactions.
|
2019-06-17 10:50:40 +02:00 |
|
|
Poojawa
|
762a3e3c02
|
Ports revised job backend from TG
|
2019-06-16 18:45:26 -05:00 |
|
|
Ghommie
|
6f2b316b30
|
Oh yea, ghost seizure fix.
|
2019-06-17 00:40:51 +02:00 |
|
|
Ghommie
|
b5e3da68bd
|
Ports "areas_in_z after start population fix"
|
2019-06-16 08:45:37 +02:00 |
|
|
Fermi
|
6b9becce71
|
Merge branch 'pr/14'
|
2019-06-14 21:29:04 +01:00 |
|
|
Ghommie
|
3cbe9cf6b0
|
componentization part 1: "The flawed theorical code"
|
2019-06-10 22:37:38 +02:00 |
|
|
Ghommie
|
b6f35435ec
|
Ports the get_area conversion to define.
|
2019-06-07 06:50:26 +02:00 |
|
|
Poojawa
|
6b82c985ae
|
Revert "fuckit, I'm just gunna wholesale port from baycode I guess"
This reverts commit 11d10d3805.
|
2019-06-06 19:39:22 -05:00 |
|
|
Poojawa
|
11d10d3805
|
fuckit, I'm just gunna wholesale port from baycode I guess
|
2019-06-05 04:55:36 -05:00 |
|
|
Poojawa
|
1f1f951924
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-06-03 05:35:52 -05:00 |
|