cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,384 Commits 55 Branches 0 Tags
fce73c84c70c75eb37d108a4b3b6e3c12f01bc93
Commit Graph

1267 Commits

Author SHA1 Message Date
r4d6
61a702bad5 Merge remote-tracking branch 'upstream/master' into substationV2 2019-12-19 23:51:14 -05:00
r4d6
22d89a9435 Add the stuff to seed the station with rooms 2019-12-19 15:26:43 -05:00
r4d6
9672f98de3 Fix a possible alert 2019-12-19 15:24:56 -05:00
Ghommie
8566e2396d Brings in some mapping code updates. 2019-12-19 00:44:14 +01:00
Putnam
114026f9ae argk 2019-12-18 02:40:51 -08:00
Seris02
ab4be051c8 pull from src and makes the code better 2019-12-18 15:32:38 +08:00
Putnam
3dbf813817 probably fixes only neutral traits existing 2019-12-17 22:34:28 -08:00
Putnam
4e6377e319 no need for this much whitespace 2019-12-17 21:29:48 -08:00
Putnam
e178db6949 screw it. minimax 2019-12-17 21:29:33 -08:00
Putnam
fab65a3dbc actually condorcet not IRV 2019-12-17 20:12:23 -08:00
Putnam
94b7a48bbc aaa 2019-12-17 18:29:49 -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
f25d75fed9 thanks linter 2019-12-17 16:29:24 -08: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
Seris02
433cc6c05a makes trait blacklisting remove random positives instead of NULLING EVERY SINGLE FUCKING QUIRK 2019-12-17 19:59:01 +08:00
kevinz000
2c228571f3 nerfs 2019-12-16 15:39:22 -07:00
kevinz000
80ffb13f06 bypass joblock 2019-12-15 23:24:43 -07:00
Putnam
e44566038b linter is correct 2019-12-14 20:32:34 -08:00
Putnam
74e4391cee uh, vote changes necessary too 2019-12-14 20:01:38 -08:00
Putnam
b96d36e719 alright that's that 2019-12-14 20:01:30 -08:00
Ghommie
b39ae815f3 Porting several quirks code updates. 2019-12-13 16:12:04 +01:00
Linzolle
1e2a4f606c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-08 14:17:00 -06:00
Ghommie
07bd51f79a Ports flag for bespoke elements. 2019-12-04 19:38:25 +01:00
Putnam3145
4f018b070f Merge pull request #9996 from Ghommie/Ghommie-cit413 
Fixes tinfoil hats giving random traumas.
 2019-11-29 06:16:36 -08:00
Ghommie
5aed21a6f0 It's just list tabbing, gray. 2019-11-29 07:43:31 +01:00
kevinz000
4551a795e4 Update game_options.dm 2019-11-27 21:20:33 -07:00
kevinz000
9fef2343a7 Update game_options.dm 2019-11-27 21:20:12 -07:00
kevinz000
f776db7ab1 Update game_options.dm 2019-11-27 21:16:42 -07:00
Ghommie
dd9116ee70 Ports elements: Lightweight shared/global components. 2019-11-28 01:47:20 +01:00
kevinz000
cf141c3a92 Update game_options.dm 2019-11-26 15:41:32 -07:00
Linzolle
cc54e5230f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-11-25 21:01:25 -06:00
Putnam
0075037d0f Makes (most) dynamic rulesets lower weight if recently fired 2019-11-24 17:09:38 -08:00
kevinz000
f28a6feb5f Merge pull request #9881 from Putnam3145/persistent-dynamic-weights 
Allows extended voting on dynamic if recent rounds too chaotic
 2019-11-23 11:45:58 -07:00
Lin
3979079fde Merge pull request #9518 from Ghommie/Ghommie-cit243 
Ports "You can now click on objects and mobs below flaps and signs"
 2019-11-22 01:36:47 +00:00
Putnam
ab87fd32ed Adds extended voting to dynamic. 2019-11-20 02:23:53 -08:00
kevinz000
6bee2721cc Merge pull request #9838 from Ghommie/Ghommie-cit366 
Ports "restores legacy sends to SSChat"
 2019-11-19 21:32:05 -07:00
kevinz000
877b79ae1c Merge pull request #9822 from Putnam3145/dynamic-wizard-rework 
Reworked how wizard spells interact with dynamic
 2019-11-19 21:29:09 -07:00
kevinz000
63899bdc3d Merge pull request #9827 from Ghommie/Ghommie-cit360 
one line shuttle fix port
 2019-11-19 21:28:50 -07:00
deathride58
cb70f47a48 Merge pull request #9814 from Citadel-Station-13/kevinz000-patch-115 
modifies donator config entry to allow multiple ckeys per line
 2019-11-19 13:38:20 -05:00
kevinz000
84e84355c3 Update code/controllers/configuration/config_entry.dm 
Co-Authored-By: Lin <linzolle@gmail.com>
 2019-11-19 01:07:43 -07:00
Linzolle
f9b632019b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-11-18 21:39:45 -06:00
Ghommie
9a65803e04 Ports "#47709" 2019-11-17 03:59:57 +01:00
Ghommie
3e6a298a6d one line shuttle fix port 2019-11-16 17:18:26 +01:00
Putnam
c9de03675e actually no i'm reworking this 2019-11-16 00:36:09 -08:00
Lin
6aa6eaafe6 Merge branch 'master' into abductor-update 2019-11-15 23:24:51 +00:00
Putnam
4f06a25951 Made staff of change require/cost threat 2019-11-14 23:26:59 -08:00
Putnam
f3c4897b48 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic 2019-11-14 22:31:48 -08:00
Putnam
e68ad13983 Reduced RNG a bit more 2019-11-14 22:24:43 -08:00