Putnam
401bbbd8ab
Reduced vote to just extended vs calm vs chaos.
2019-11-06 00:07:52 -08:00
Ghommie
4ab3512dda
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
2019-11-04 23:15:12 +01:00
Ghommie
29daa0c908
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
2019-11-04 22:59:24 +01:00
kevinz000
a750721fd2
Merge pull request #9653 from Poojawa/job-ordering
...
Level Order listing
2019-11-03 06:24:08 -07: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
Ghommie
6cf35a67b1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
2019-10-31 23:17:39 +01:00
Ghommie
17e794bd59
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
2019-10-31 01:43:44 +01:00
Linzolle
266f1ff958
Merge remote-tracking branch 'upstream/master' into abductor-update
2019-10-29 23:58:01 -05:00
kevinz000
6dc6159f4a
Merge pull request #9578 from deathride58/mapsubsystemimprovements
...
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
2019-10-29 21:42:32 -07:00
kevinz000
5ba86d2fc3
Merge pull request #9423 from Poojawa/NPC-Run-levels
...
Boosts NPC runtime priority
2019-10-29 21:35:17 -07: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
kevinz000
d64d1752b4
Merge pull request #9616 from deathride58/post512jukeboxes
...
Makes jukeboxes work again after 512.1459's changes to SOUND_UPDATE (and other small fixes/tweaks)
2019-10-29 21:25:12 -07:00
Ghommie
a5b37b658b
Purging a lot of space indention in favor of tabs.
2019-10-29 15:46:31 +01: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
Poojawa
cbf74f63c8
Level Order listing
2019-10-29 00:00:48 -05:00
Ghommie
a2f9aaf899
Porting "Adjacent Atmos subsystem revival"
2019-10-28 17:04:31 +01:00
Ghommie
f54449bc7c
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
2019-10-28 16:41:50 +01:00
kevinz000
78174fcc06
Update shuttle.dm
2019-10-27 16:16:02 -07:00
Ghommie
4aa1d55abb
Porting multi-z support updates.
2019-10-27 16:32:32 +01:00
deathride58
6cce995f77
Makes jukeboxes work again after 512.1459's changes to SOUND_UPDATE
2019-10-25 20:59:10 -04:00
MMMiracles
8fb0a68feb
Adds Hat Throwing ( #45355 )
...
* adds hat throwing on people and borgs
* clothing flags, hats can knock off non-items, borg hat blacklist check
* prevents hats with items in them from being able to land on heads
* removes extra equip, hats can go on the hatless again, tinfoil fix
* if
* bit flag
2019-10-25 16:19:19 -05:00
kevinz000
5f75664350
Update shuttle.dm
2019-10-25 09:35:59 -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
9096f03ad3
Merge pull request #8654 from Ghommie/Ghommie-cit54
...
ports in the Hilbert's Hotel.
2019-10-24 19:07: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
Linzolle
9250b1c103
big uppdate season
2019-10-23 21:08:47 -05:00
deathride58
39794a1dd8
150 hours of testing
2019-10-23 15:21:18 -04:00
Ghommie
fc1f10c97f
Porting components updates and fixing phantom thief component.
2019-10-23 13:01:31 +02: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
Putnam
bacc875524
added actual game configs to all the dynamic modes
2019-10-22 19:12:54 -07:00
deathride58
68813b6846
Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer
2019-10-22 19:14:12 -04:00
Putnam
33232fba3a
s
2019-10-22 00:45:30 -07:00
Putnam
d96976fc59
Added dynamic vote logging
2019-10-22 00:34:14 -07:00
Putnam
0a000f3165
Division by zero.
2019-10-21 01:05:18 -07:00
kevinz000
9e63413911
Merge pull request #9466 from deathride58/yawnborgs
...
Adds a config option to determine the minimum alert level for secborgs (defaulting to red alert)
2019-10-21 01:04:34 -07:00
Putnam
770d95ce83
rename indifferent to balanced
...
also, remember ur spaces
2019-10-20 19:05:24 -07:00
Putnam
d1326398dd
make extended vote majority instead of plurality
2019-10-20 19:00:22 -07:00
Putnam
933e4c5812
grammar
2019-10-20 18:57:25 -07:00
Putnam
07064298b0
Dynamic voting (draft)
2019-10-20 18:54:17 -07:00
Ghommie
ec22088534
Complying with suggestions. Also stops dnr observers from getting ghost role notifications
2019-10-20 09:15:35 +02:00
kevinz000
8be030a931
Merge pull request #9482 from Thalpy/Wiki
...
Gives chemistry a library (and updates buttons at the top right of the game too).
2019-10-17 13:01:37 -07:00
Ghommie
f73516a17f
made it into config.
2019-10-17 04:44:30 +02:00
Ghommie
f2cd85e550
Ports "You can now click on objects and mobs below flaps and signs"
2019-10-17 02:45:13 +02:00
Ghommie
aa6860250b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226
2019-10-15 20:40:07 +02:00
deathride58
b3a81dce01
Secborg buffs - Adds incapacitation functionality to k9 jaws, gives secborg a hybrid taser, tweaks pounces, adds config option to weaken secborgs
2019-10-14 18:18:32 -04:00
Thalpy
764c3e5757
Missed one
2019-10-13 16:38:05 +01:00