Lin
|
f7b91f9b65
|
Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
|
2020-01-03 00:01:54 +00:00 |
|
kevinz000
|
ec67a38093
|
Merge pull request #10330 from keronshb/keronnanite
More nanites from /tg/station
|
2019-12-31 19:32:05 -08:00 |
|
Seris02
|
3d3407363c
|
auto ooc
|
2019-12-29 18:48:00 +08:00 |
|
keronshb
|
390cfd8b64
|
Nanite ports from /tg/
Ports a couple of the newer nanite features from /tg/
|
2019-12-28 16:56:17 -05:00 |
|
Ghom
|
9a022f21eb
|
Merge pull request #10245 from r4d6/substationV2
Make Box's Engine be randomised between SM, Tesla and Singulo V2 [TEST-MERGE]
|
2019-12-23 18:58:26 +01:00 |
|
r4d6
|
0a3e370a93
|
Move the config up to avoid conflict
|
2019-12-23 12:45:40 -05:00 |
|
r4d6
|
01a8fe1cd6
|
Add config options
|
2019-12-23 12:41:52 -05:00 |
|
r4d6
|
b909f54ba5
|
Revert "Revert "Add the option to restrict the Engine that spawn""
This reverts commit d851beea16.
|
2019-12-23 10:25:37 -05:00 |
|
r4d6
|
d851beea16
|
Revert "Add the option to restrict the Engine that spawn"
This reverts commit e3e1f91635.
|
2019-12-23 10:23:55 -05:00 |
|
r4d6
|
e3e1f91635
|
Add the option to restrict the Engine that spawn
|
2019-12-23 10:06:35 -05:00 |
|
r4d6
|
84d99c8fe8
|
Fix indentation
|
2019-12-21 15:00:53 -05:00 |
|
r4d6
|
383e09651f
|
Suggestions
|
2019-12-21 14:55:37 -05:00 |
|
Ghom
|
2b2a3c2721
|
Merge pull request #9950 from Citadel-Station-13/marauder-nerf-1
Nerfs the Clockwork Marauder meta
|
2019-12-21 17:26:04 +01:00 |
|
Ghom
|
848ad4b39b
|
Merge pull request #9940 from Putnam3145/dynamic-roundstart-overhaul
Dynamic rulesets that have fired in recent rounds have lower weight
|
2019-12-21 11:20:24 +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 |
|
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 |
|
Putnam
|
3dbf813817
|
probably fixes only neutral traits existing
|
2019-12-17 22:34:28 -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 |
|
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 |
|