 Fermi
|
614a462176
|
Revert "Revert "Merge remote-tracking branch 'upstream/master'""
This reverts commit 1509d9d183.
|
2019-11-24 03:33:02 +00:00 |
|
|
Fermi
|
ba4fa1ef67
|
Revert "PLASE"
This reverts commit 8af225e6e3.
|
2019-11-24 03:06:08 +00:00 |
|
|
Fermi
|
aeb8606ce0
|
Revert "Revert "PLASE""
This reverts commit 00601a0c87.
|
2019-11-24 03:04:52 +00:00 |
|
|
Fermi
|
1509d9d183
|
Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit 135608551f, reversing
changes made to ce7e9ac452.
|
2019-11-24 03:04:13 +00:00 |
|
|
Fermi
|
c8b206a4cf
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 03:04:04 +00:00 |
|
|
Fermi
|
4c1c257035
|
Revert "Revert "pls""
This reverts commit b23f2a4460.
|
2019-11-24 03:02:21 +00:00 |
|
|
Fermi
|
b23f2a4460
|
Revert "pls"
This reverts commit 8c97511871.
|
2019-11-24 02:49:20 +00:00 |
|
|
Fermi
|
8c97511871
|
pls
ugh
|
2019-11-24 02:47:52 +00:00 |
|
|
nik707
|
0300927974
|
Merge pull request #9487 from Citadel-Station-13/spooky
adds an easy way for admins to force enable halloween races without the rest of halloween's code
|
2019-11-20 23:00:09 -06:00 |
|
|
kevinz000
|
4ad56ac1e2
|
Merge pull request #9614 from Trilbyspaceclone/patch-234
Lowers ghosts and insain clowns hp to 120 from 1e6
|
2019-11-14 16:07:43 -07:00 |
|
|
Ghommie
|
e977ba6729
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290
|
2019-11-10 23:17:58 +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 |
|
|
Trilbyspaceclone
|
fe87eec45c
|
i hate mob code
|
2019-11-04 00:58:51 -05:00 |
|
|
Ghommie
|
431ab8fc0b
|
better be safe than sorry.
|
2019-11-03 17:56:30 +01:00 |
|
|
Ghommie
|
3cf056ed93
|
Also fixing jacqueen... wrong tools.dmi
|
2019-11-03 15:26:16 +01:00 |
|
|
Ghommie
|
2653a2965d
|
How about we only check the living?
|
2019-11-02 20:46:33 +01:00 |
|
|
Ghommie
|
f4587b4260
|
This is very unprofessional. Yet I'm no google architect.
|
2019-11-02 16:47:25 +01:00 |
|
|
Ghommie
|
50fc1004ba
|
Actually holopads, so they won't end up in maintenance...
|
2019-11-02 16:46:02 +01:00 |
|
|
Ghommie
|
3193e3ce20
|
fix.
|
2019-11-02 16:12:37 +01:00 |
|
|
Ghommie
|
a949f84557
|
missing bits.
|
2019-11-02 16:00:48 +01:00 |
|
|
Ghommie
|
1bf10c0435
|
Improving Jacqueen's teleportation area selection.
|
2019-11-02 15:50:54 +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 |
|
|
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 |
|
|
Trilbyspaceclone
|
bbd3c55fbc
|
Update halloween.dm
|
2019-10-29 21:37:44 -04:00 |
|
|
Ghommie
|
a5b37b658b
|
Purging a lot of space indention in favor of tabs.
|
2019-10-29 15:46:31 +01:00 |
|
|
Fermi
|
be470c2d18
|
Oranges are high
|
2019-10-29 08:07:11 +00:00 |
|
|
Fermi
|
5356afa9e6
|
Barthhhh
|
2019-10-29 06:14:31 +00:00 |
|
|
Thalpy
|
e71dc54594
|
i--
|
2019-10-29 03:29:56 +00:00 |
|
|
Thalpy
|
a1e611e7aa
|
Heck
|
2019-10-29 03:23:46 +00:00 |
|
|
Thalpy
|
39f7116353
|
Oops
|
2019-10-29 03:22:21 +00:00 |
|
|
Thalpy
|
0fabd72087
|
Barth you fusspot
|
2019-10-27 22:40:45 +00:00 |
|
|
Thalpy
|
6de94a23c0
|
Oops
|
2019-10-27 22:32:47 +00:00 |
|
|
Thalpy
|
c30f550274
|
Well here it is
|
2019-10-27 22:29:35 +00:00 |
|
|
Thalpy
|
a76ff4efe6
|
Alright
|
2019-10-27 19:24:23 +00:00 |
|
|
Thalpy
|
739de1b378
|
Fixes
|
2019-10-27 19:07:06 +00:00 |
|
|
Trilbyspaceclone
|
d9babbd97b
|
fuck god mode
|
2019-10-26 09:16:29 -04:00 |
|
|
Trilbyspaceclone
|
f983db61bf
|
Update halloween.dm
|
2019-10-25 18:08:33 -04:00 |
|
|
Ghommie
|
e1928a18f1
|
Porting GetComponent macros removal, and some related changes.
|
2019-10-23 15:04:28 +02: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 |
|
|
kappa-sama
|
cbf02e76a4
|
fixes cringe
why is this broken and who added this
|
2019-10-16 19:47:14 -04:00 |
|
|
Fermi
|
f587beeef4
|
2 hats and undoes halloween accidental change
|
2019-10-15 22:56:42 +01:00 |
|
|
Thalpy
|
e7c5e74d3a
|
Hopefully no break
|
2019-10-13 23:41:06 +01:00 |
|
|
Thalpy
|
ac2aba50a6
|
Turns Jacq into her own event
|
2019-10-13 22:33:46 +01:00 |
|
|
kevinz000
|
bf1d4ed7d4
|
Update holidays.dm
|
2019-10-13 13:52:17 -07:00 |
|
|
Thalpy
|
356a1279f1
|
Adds vars for the ball.
|
2019-10-13 20:06:40 +01:00 |
|
|
Fermi
|
ecfc988911
|
Okay!
|
2019-10-12 09:15:32 +01:00 |
|
|
Fermi
|
6e7c433536
|
Song fix
|
2019-10-11 21:34:30 +01:00 |
|
|
Fermi
|
dbcda948fb
|
Darn thing
|
2019-10-11 19:56:58 +01:00 |
|
|
Fermi
|
bfd97a82ca
|
Eh 4 mins.
|
2019-10-11 18:56:33 +01:00 |
|
|
Fermi
|
8f6c988536
|
Explod
|
2019-10-11 18:17:43 +01:00 |
|