 nik707
|
0f9c3350cd
|
Merge pull request #10189 from Putnam3145/storytellers
n word
|
2020-01-02 22:01:19 -06:00 |
|
|
kevinz000
|
24e3b88a34
|
Merge remote-tracking branch 'citadel/master' into michael_labs
|
2019-12-30 00:32:25 -08:00 |
|
|
kevinz000
|
fb77d07d52
|
plushies woohoo
|
2019-12-23 16:56:43 -08: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 |
|
|
kevinz000
|
2c228571f3
|
nerfs
|
2019-12-16 15:39:22 -07:00 |
|
|
Putnam
|
b96d36e719
|
alright that's that
|
2019-12-14 20:01:30 -08: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 |
|
|
kevinz000
|
cf141c3a92
|
Update game_options.dm
|
2019-11-26 15:41:32 -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 |
|
|
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 |
|
|
Putnam
|
c9de03675e
|
actually no i'm reworking this
|
2019-11-16 00:36:09 -08: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 |
|
|
kevinz000
|
b8c45ba6a1
|
Update donator.dm
|
2019-11-14 18:26:50 -07:00 |
|
|
kevinz000
|
0dcb2d3b9c
|
Update config_entry.dm
|
2019-11-14 18:25:52 -07:00 |
|
|
kevinz000
|
e8938f52a7
|
Update donator.dm
|
2019-11-14 18:22:21 -07:00 |
|
|
kevinz000
|
a3ad224e0f
|
Update config_entry.dm
|
2019-11-14 18:21:08 -07:00 |
|
|
kevinz000
|
09e5cd95a3
|
Merge pull request #9690 from Ghommie/Ghommie-cit308
Unmodularize configuration, _globalvars and subsystems.
|
2019-11-14 15:50:20 -07:00 |
|
|
kevinz000
|
af0962088c
|
Merge pull request #9453 from Ghommie/Ghommie-cit226
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
|
2019-11-14 15:47:18 -07:00 |
|
|
Putnam
|
6d8f2b8914
|
Made s?laughter demon and apprentice cost threat, too.
|
2019-11-14 06:42:13 -08:00 |
|
|
Putnam
|
304ce37d6c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
|
2019-11-14 02:23:48 -08:00 |
|
|
Ghommie
|
4c1eba0d81
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226
|
2019-11-10 23:52:48 +01:00 |
|
|
Ghommie
|
1e49ce76d3
|
Dreamchecker compatibility changes, part 1.
|
2019-11-10 20:48:30 +01:00 |
|
|
Putnam
|
6de835f5e3
|
Assassination is less likely at lower threats.
|
2019-11-09 04:39:14 -08:00 |
|
|
Putnam
|
e143771703
|
Made antag injection happen more often, initial injection later.
|
2019-11-08 04:25:52 -08:00 |
|
|
Putnam
|
d795df1150
|
made warops part of the dynamic system, in dynamic
|
2019-11-07 23:39:17 -08:00 |
|
|
Putnam
|
eb9c8c9aca
|
made glorious death spend threat
|
2019-11-06 18:07:39 -08:00 |
|
|
Putnam
|
44ad4662eb
|
fewer double roundstart antags
|
2019-11-06 18:07:26 -08:00 |
|
|
Putnam
|
33f7663008
|
this is probably required for compile
|
2019-11-06 17:20:56 -08:00 |
|
|
Putnam
|
a83901a8b0
|
and finished the wizard change merge
|
2019-11-06 16:30:07 -08:00 |
|
|
Putnam
|
1c4256f28f
|
actually fuck this config's its own file now
|
2019-11-06 16:28:28 -08:00 |
|
|
Putnam
|
f3afc5de1b
|
Merge branch 'malf-dynamic' into super-special-awesome-dynamic
|
2019-11-06 16:03:04 -08:00 |
|
|
kevinz000
|
3365522bdf
|
Merge pull request #9654 from Putnam3145/dynamic-config-2
Adds dynamic antag injection to config
|
2019-11-03 06:21:24 -07:00 |
|
|
Ghommie
|
100a87d57b
|
Unmodularize configuration, _globalvars and subsystems.
|
2019-11-02 20:42:01 +01:00 |
|
|
kevinz000
|
b172c5f691
|
Merge pull request #9501 from deathride58/stronksecborgs
Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)
|
2019-10-29 21:29:12 -07:00 |
|
|
Putnam
|
df3d5ab51f
|
always gotta be one, at least
|
2019-10-28 23:05:22 -07:00 |
|
|
Putnam
|
cb88fd1a44
|
added dynamic antag injection to config
|
2019-10-28 22:58:35 -07:00 |
|
|
Putnam
|
bb9b0ce312
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into super-special-awesome-dynamic
|
2019-10-24 22:38:33 -07:00 |
|
|
kevinz000
|
d5041b7dde
|
Merge pull request #9582 from Putnam3145/dynamic-config
Adding dynamic rules to the game config
|
2019-10-24 18:55:29 -07:00 |
|
|
Putnam
|
7050ec281d
|
wow do NOT want those
|
2019-10-23 02:14:03 -07:00 |
|
|
Putnam
|
67662d1d69
|
everything works now
|
2019-10-22 21:39:28 -07:00 |
|
|
Putnam
|
9dd4d6a93c
|
silly errors
|
2019-10-22 20:07:26 -07:00 |
|