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
Poojawa
bd49187ea7
on second thought, let's not try to half ass fancy ideas.
2019-08-26 14:45:36 -05:00
Poojawa
9558252b93
Revert/replaces a lot of #8024 with bleed_rate
...
Wearing armor reduces the blood loss you incur, no longer are you instantly deleted on blood. Dripping blood WILL kill you if you don't solve that issue, medical gauze has been tripled as a QoL for medical staff as a result.
2019-08-26 14:22:17 -05:00
Ghommie
5d1cac62da
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
2019-08-24 13:50:22 +02:00
kevinz000
fb2971e3e6
Merge remote-tracking branch 'origin/master' into donator_grouping
2019-08-15 14:40:44 -07:00
Poojawa
0290a46ddc
Impliments Ghom review, reverts blood list back to component
2019-08-15 12:32:44 -05:00
Poojawa
2073921f4b
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-15 08:39:41 -05:00
Poojawa
b671384015
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-15 08:23:48 -05:00
deathride58 and GitHub
2406254faa
Merge pull request #9100 from cebutris/got-milk
...
Breasts no longer lactate by default, Lactation is now a preference
2019-08-14 15:40:53 -04:00
Poojawa
dcd682bd59
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-08-10 23:48:47 -05:00
Poojawa
2b2bdb37ba
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-10 23:26:20 -05:00
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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
f77bcc9765
Merge branch 'master' into master
2019-07-14 15:10:32 +01:00
kevinz000 and GitHub
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 and GitHub
4c4dbd0e17
Merge branch 'master' into master
2019-07-13 19:33:46 +01:00
kevinz000 and GitHub
e5d445c4d3
Merge pull request #8846 from Ghommie/Ghommie-cit122
...
Rubber toolboxes.
2019-07-12 07:35:25 -07:00
kevinz000 and GitHub
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 and GitHub
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 and GitHub
c418312cc6
Merge branch 'master' into master
2019-07-09 05:33:09 +01:00
deathride58 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
41eee65b15
Merge branch 'master' into master
2019-06-17 12:18:40 +01:00
Ghommie