shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,831 Commits 5 Branches 0 Tags
07a5f052d36bdc33ccef0f5ef4141d94d280c5fb
Commit Graph

1376 Commits

Author SHA1 Message Date
Ghom
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
nik707
0f9c3350cd Merge pull request #10189 from Putnam3145/storytellers 
n word
 2020-01-02 22:01:19 -06:00
Lin
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
Lin
b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
Putnam
0b60b121c2 afwafwadjiwao 2019-12-30 19:34:57 -08:00
kevinz000
24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
kevinz000
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
kevinz000
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
kevinz000
74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options 
Lewd chem sanity pass/"ERP preferences"
 2019-12-30 00:09:18 -08:00
kevinz000
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
Putnam3145
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
Putnam
5174cb08a6 Made war ops always allowed on teamwork, chaotic 2019-12-27 22:45:06 -08:00
Lin
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
Lin
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
Ghommie
187b9bb13a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit483 2019-12-23 05:10:38 +01:00
TrilbySpaceClone
c7dbdd73df Merge branch 'master' into donut 2019-12-22 02:36:57 -05:00
Lin
37a0f0d7e6 Merge pull request #10241 from Ghommie/Ghommie-cit482 
Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly
 2019-12-21 22:44:09 +00:00
Ghom
31ba9fe4a8 Revert "Makes HE pipes realistically radiate away heat" 2019-12-21 22:43:26 +01:00
Ghommie
395457f7ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471 2019-12-21 17:59:32 +01:00
Putnam
128b857d99 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into storytellers 2019-12-21 08:31:44 -08:00
Ghom
aea2b8865e Merge pull request #10120 from Citadel-Station-13/night_vision 
Night vision trait but it just boosts barely-lit visibility
 2019-12-21 15:30:32 +01:00
Ghom
a384b1782b Merge pull request #10164 from kappa-sama/martialartist 
What ho, Muscle Wizard! Might you cast us a spell?
 2019-12-21 15:24:06 +01:00
Ghom
06cbb381d3 Better safe than sorry. 2019-12-21 15:17:29 +01:00
Ghom
19fc981cc1 Merge pull request #9596 from Linzolle/abductor-update 
Bring abductors up-to-date with /tg/.
 2019-12-21 11:15:29 +01:00
Putnam
c810145fc1 also adds aphrodisiacs, slaps, all hypno as prefs 2019-12-20 14:47:09 -08:00
Ghom
e526f26f46 Merge pull request #10126 from Putnam3145/he-tweaks 
Makes HE pipes realistically radiate away heat
 2019-12-20 13:34:47 +01:00
nik707
dd62a9ca87 Merge pull request #10084 from Hatterhat/i-dont-test-my-code 
i dont make good code
 2019-12-19 14:10:18 -06:00
Putnam
f2b46f0951 ROBUST OPTING MECHANICS 2019-12-19 11:14:02 -08:00
Putnam
9ec2c8a7f1 MKUltra made double opt-in 2019-12-19 09:54:34 -08:00
Ghommie
fb2b259d92 Ports "Refactors can_see_reagents" 2019-12-19 17:17:18 +01:00
Ghommie
88978209fa Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly" 2019-12-19 16:42:25 +01:00
Ghommie
12aa266efe Missed this one too. 2019-12-19 12:27:30 +01:00
Ghommie
8566e2396d Brings in some mapping code updates. 2019-12-19 00:44:14 +01:00
Putnam
fab65a3dbc actually condorcet not IRV 2019-12-17 20:12:23 -08:00
Linzolle
70e50e57cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-17 20:21:49 -06:00
Putnam
04f82f3153 it works 2019-12-17 15:48:28 -08:00
Putnam
e6e68ae1a3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into storytellers 2019-12-17 14:18:19 -08:00
Putnam
9f21fca798 workin on IRV 2019-12-17 14:18:13 -08:00