 kevinz000
|
fa7dcad49a
|
compile
|
2020-01-07 04:54:11 -08:00 |
|
|
kevinz000
|
ae73927b67
|
patches
|
2020-01-07 02:39:16 -08:00 |
|
|
r4d6andGitHub
|
c3f47e713a
|
Merge branch 'master' into RCD-Updates
|
2020-01-07 00:04:43 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
f7aa4f3050
|
Merge branch 'master' into glassware
|
2020-01-06 23:55:44 -05:00 |
|
|
keronshb
|
a7af5203e7
|
This is a test to see if they all work together
Title
|
2020-01-06 20:29:44 -05:00 |
|
|
keronshb
|
35cd77d433
|
Adds the nanite remote for some programs
Adds a new remote function from tg
|
2020-01-06 20:28:33 -05:00 |
|
|
kevinz000
|
7006f2b1be
|
more compile stuff
|
2020-01-06 04:23:52 -08:00 |
|
|
Putnam
|
32043a9062
|
whoops forgot permaboner
|
2020-01-06 01:14:00 -08:00 |
|
|
LinandGitHub
|
7ad6021472
|
Merge pull request #10437 from Ghommie/Ghommie-cit497
Fixes roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!
|
2020-01-06 03:49:52 +00:00 |
|
|
Putnam
|
fba7a8abb0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-05 19:12:28 -08:00 |
|
|
Putnam
|
d75a525b3c
|
let's fix arousal huh
|
2020-01-05 19:10:48 -08:00 |
|
|
GhomandGitHub
|
ca8d93ad17
|
Merge branch 'master' into alcohol-intolerance
|
2020-01-04 23:17:55 +01:00 |
|
|
kevinz000
|
b4736febcf
|
uhh
|
2020-01-04 13:02:23 -08:00 |
|
|
Ghommie
|
356304f68f
|
Fixes roundstart mushpeople not having MUSH PUUUUUUUUUUUUNCH!!
|
2020-01-04 20:34:31 +01:00 |
|
|
GhomandGitHub
|
499907f9b7
|
Merge pull request #10191 from Citadel-Station-13/michael_labs
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
|
2020-01-04 14:07:25 +01:00 |
|
|
Ghommie
|
686a76dd1d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-04 13:35:05 +01:00 |
|
|
r4d6andGitHub
|
7347cb0ba6
|
Merge branch 'master' into RCD-Updates
|
2020-01-03 03:09:11 -05:00 |
|
|
kevinz000
|
8e1affa1f5
|
nightshift changes
|
2020-01-02 23:56:40 -08:00 |
|
|
r4d6
|
5c94e02eac
|
Add simple RCD Circuits
Port : https://github.com/tgstation/tgstation/pull/45357
|
2020-01-03 02:32:43 -05:00 |
|
|
kevinz000
|
031f485e4d
|
updates
|
2020-01-02 23:24:47 -08:00 |
|
|
nik707andGitHub
|
0f9c3350cd
|
Merge pull request #10189 from Putnam3145/storytellers
n word
|
2020-01-02 22:01:19 -06:00 |
|
|
TrilbyspacecloneandGitHub
|
2931cb6757
|
Merge branch 'master' into glassware
|
2020-01-02 20:30:20 -05:00 |
|
|
LinandGitHub
|
f7b91f9b65
|
Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
|
2020-01-03 00:01:54 +00:00 |
|
|
Putnam
|
444f862a4d
|
Renamed the options to make clear this isn't scoring?
|
2020-01-01 11:37:40 -08:00 |
|
|
kevinz000
|
094d225874
|
Merge remote-tracking branch 'citadel/master' into michael_labs
|
2019-12-31 19:54:01 -08:00 |
|
|
Putnam
|
850a407cf4
|
majority judgement time
|
2019-12-31 16:37:33 -08:00 |
|
|
LinandGitHub
|
b651bbcdb3
|
Merge branch 'master' into Ghommie-cit367
|
2019-12-31 22:37:59 +00:00 |
|
|
Seris02
|
54f859fe06
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2019-12-31 17:52:49 +08:00 |
|
|
Putnam
|
0b60b121c2
|
afwafwadjiwao
|
2019-12-30 19:34:57 -08:00 |
|
|
Ghommie
|
80e716eeaf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-30 18:14:47 +01:00 |
|
|
kevinz000
|
24e3b88a34
|
Merge remote-tracking branch 'citadel/master' into michael_labs
|
2019-12-30 00:32:25 -08:00 |
|
|
kevinz000andGitHub
|
fef66b1bd7
|
Merge pull request #10320 from Seris02/exclusion
excludes certain ghost roles from being affected by health events
|
2019-12-30 00:26:19 -08:00 |
|
|
kevinz000andGitHub
|
97aadba950
|
Merge pull request #10259 from Citadel-Station-13/revert-10126-he-tweaks
Revert "Makes HE pipes realistically radiate away heat"
|
2019-12-30 00:13:45 -08:00 |
|
|
kevinz000andGitHub
|
74edd7b13f
|
Merge pull request #10243 from Putnam3145/lewdchem-better-options
Lewd chem sanity pass/"ERP preferences"
|
2019-12-30 00:09:18 -08:00 |
|
|
kevinz000andGitHub
|
310d343242
|
Merge pull request #10095 from Ghommie/Ghommie-cit443
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
|
2019-12-30 00:03:21 -08:00 |
|
|
Putnam
|
cc087b990c
|
Code improvements
|
2019-12-29 21:01:55 -08:00 |
|
|
Putnam3145andGitHub
|
640419eed5
|
Merge pull request #10343 from Ghommie/Ghommie-cit494
[s] Fixes anti-ghost-role vars a little.
|
2019-12-29 20:54:55 -08:00 |
|
|
Seris02
|
f1292c503c
|
makes it a trait
|
2019-12-30 11:33:15 +08:00 |
|
|
Ghommie
|
edd05cebea
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367
|
2019-12-30 00:28:36 +01:00 |
|
|
Ghommie
|
0ab817c208
|
[s] Fixes ghost anti-ghostrole timers a little.
|
2019-12-29 22:22:20 +01:00 |
|
|
TrilbySpaceClone
|
06f81fe9f9
|
fewmore fixes
|
2019-12-29 00:13:07 -05:00 |
|
|
Seris02
|
862acf2f06
|
ports hyper's genetics
|
2019-12-28 21:33:15 +08:00 |
|
|
Putnam
|
5174cb08a6
|
Made war ops always allowed on teamwork, chaotic
|
2019-12-27 22:45:06 -08:00 |
|
|
LinandGitHub
|
d562a5ba27
|
Merge pull request #10212 from Ghommie/Ghommie-cit471
Ports some hud and update_icon code updates.
|
2019-12-28 04:07:03 +00:00 |
|
|
Putnam
|
63112c2f49
|
while we're at it let's make it work for all of 'em
|
2019-12-25 18:30:25 -08:00 |
|
|
Putnam
|
5764ccef1b
|
Allowed preventing dynamic storytellers if too common recently
|
2019-12-25 16:16:11 -08:00 |
|
|
LinandGitHub
|
1931a2f715
|
Merge pull request #10242 from Ghommie/Ghommie-cit483
Ports "Refactors can_see_reagents"
|
2019-12-25 19:03:42 +00:00 |
|
|
Seris02
|
a106fde6cc
|
a few fixes here and there and updating it
|
2019-12-24 23:38:27 +08:00 |
|
|
Seris02
|
9e6f0762b7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into rising_bass
|
2019-12-24 22:27:41 +08:00 |
|
|
Putnam
|
13a8efe616
|
no assassination at all (!!) on calm
|
2019-12-23 00:43:25 -08:00 |
|