Jordan Brown
ba1d3fd2c2
Merge pull request #32150 from MrStonedOne/patch-442
...
Meteor gating tweaks
2017-10-30 14:51:44 -05:00
LetterJay
b0573cc67f
Merge pull request #3678 from Citadel-Station-13/upstream-merge-32144
...
[MIRROR] Adds new valentines; replaces outdated/shitty ones.
2017-10-29 23:38:55 -04:00
bgobandit
adf7bdccbd
Adds new valentines; replaces outdated/shitty ones. ( #32144 )
...
* adds valentines, cuts old references
* Adds valentines, replaces outdated ones
* more entendre-y
2017-10-29 11:04:04 -05:00
Kyle Spier-Swenson
8d234df96f
Events take pre-game lobby time into account ( #32154 )
...
* Events take pre-game lobby time into account
* Friends don't let friends code without coffee.
It would appear that I have no friends
* i blame cyberboss
2017-10-29 10:36:56 -05:00
LetterJay
39f683ab8d
Update meteor_wave.dm
2017-10-27 15:32:38 -05:00
LetterJay
12d336cbf0
Update halloween.dm
2017-10-27 15:32:15 -05:00
KorPhaeron
00163837de
Halloween Tweaks
2017-10-26 05:20:53 -05:00
LetterJay
58ef2f1872
Merge pull request #3551 from Citadel-Station-13/upstream-merge-31922
...
[MIRROR] Adds admin override for false alarm event.
2017-10-23 03:44:25 -04:00
LetterJay
5d20c88a5c
Update false_alarm.dm
2017-10-22 10:55:42 -05:00
LetterJay
03690f9d67
Update blob.dm
2017-10-22 10:51:21 -05:00
Jordan Brown
faf0e0a10a
Adds admin override for false alarm event.
2017-10-22 00:05:23 -05:00
KorPhaeron
c42e1b17f4
Blob fixes
2017-10-21 14:08:10 -05:00
CitadelStationBot
e827f02863
[MIRROR] Fixes various spelling and grammar errors. ( #3436 )
...
* Fixes various spelling and grammar errors.
* Update crashedship.dm
* Update listeningstation.dm
* Update augments_chest.dm
* Update augments_chest.dm
2017-10-21 07:10:23 -05:00
LetterJay
f93733576e
Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528
...
[MIRROR] Minor refactor of how gas IDs are handled
2017-10-12 07:19:30 -04:00
duncathan salt
c0e9cde5c2
Minor refactor of how gas IDs are handled
2017-10-12 00:30:09 -05:00
AnturK
5be4669924
Datum antag wizard.
2017-10-11 05:24:17 -05:00
MoreRobustThanYou
b05a4ebb29
Makes the santa event properly poll ghosts ( #31437 )
...
* Makes the santa event properly poll ghosts
* Update xmas.dm
* Update xmas.dm
* Create event.dm
* Update tgstation.dme
* Update xmas.dm
* Update event.dm
* Update event.dm
* Update event.dm
* Update event.dm
* Update event.dm
* Update event.dm
2017-10-10 03:16:23 -05:00
KorPhaeron
e7800a2235
Uses the proper list for xeno landmarks/nightmare spawning ( #31470 )
2017-10-09 16:00:24 -05:00
KorPhaeron
39728cc9b3
Nightmare spawn event ( #31376 )
...
* Nightmare Event
* Update nightmare.dm
* Standards
2017-10-07 08:41:25 -05:00
kevinz000
3b3b45c03c
Fixes/tweaks wormholes event and portals ( #30846 )
...
* fix
* THERE WE GO
* Update portals.dm
2017-10-03 04:37:35 -05:00
KorPhaeron
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
LetterJay
cc8f494f1f
Merge pull request #3036 from Citadel-Station-13/upstream-merge-31129
...
[MIRROR] Cleans up some antag/event landmark checks
2017-10-01 23:36:48 -04:00
LetterJay
676abb946c
Update halloween.dm
2017-10-01 15:26:56 -05:00
LetterJay
f1f99fc26c
Update electrical_storm.dm
2017-10-01 15:26:32 -05:00
LetterJay
00aa312610
Update carp_migration.dm
2017-10-01 15:26:15 -05:00
LetterJay
6ca3deb8d1
Merge branch 'master' into upstream-merge-31129
2017-10-01 15:45:54 -04:00
AnturK
cae3dd615d
Fixes events with sleeps.
2017-10-01 07:34:01 -05:00
ShizCalev
2635689e79
Cleans up some antag/event landmark checks
2017-09-30 21:33:13 -05:00
LetterJay
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
Jordan Brown
77c2c77f0e
Removes a call to datum/New()
2017-09-29 15:59:19 -05:00
Jordan Brown
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
LetterJay
7a0ffb8a67
Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888
...
[MIRROR] Refactors cinematics.
2017-09-27 23:42:35 -04:00
AnturK
fd0bc465cc
Refactors cinematics.
2017-09-26 04:20:59 -05:00
pubby
34e186dadb
Datum abductors refactor
2017-09-24 18:00:49 -05:00
CitadelStationBot
2a860d1954
[MIRROR] More Initialize() fixes, requires someone to test with DB ( #2857 )
...
* More Initialize() fixes, requires someone to test with DB
* fucking mirror failure
2017-09-22 23:35:22 -05:00
Poojawa
8a2ec7d39a
Update radiation_storm.dm
2017-09-14 13:32:48 -05:00
CitadelStationBot
c6025a7049
[MIRROR] Adds some TRUE and FALSE ( #2751 )
...
* This is not a refactor (#30670 )
* Adds some TRUE and FALSE
2017-09-14 07:38:27 -05:00
CitadelStationBot
e4db027692
[MIRROR] Fixes to more Initialize procs ( #2733 )
...
* Fixes to more Initialize procs
* Update ai_monitored.dm
* Update cleanable.dm
* Update instruments.dm
* Update musician.dm
* Update noticeboard.dm
* Update mimic.dm
* Update interactive.dm
2017-09-13 22:54:12 -05:00
LetterJay
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
LetterJay
97b25bc59a
Update vent_clog.dm
2017-09-11 15:58:12 -05:00
LetterJay
fe3d825596
Update spider_infestation.dm
2017-09-11 15:57:45 -05:00
LetterJay
12f17ecbe7
Update radiation_storm.dm
2017-09-11 15:57:15 -05:00
LetterJay
57343fa712
Update immovable_rod.dm
2017-09-11 15:56:25 -05:00
KorPhaeron
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
Jordan Brown
92b78d3298
[s] Adds a security token to all admin hrefs
2017-09-08 21:16:02 -05:00
LetterJay
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
Poojawa
a4c92a8155
Update radiation_storm.dm
2017-09-04 03:12:51 -05:00
kevinz000
f344c5edf2
Merge branch 'master' into upstream-merge-30084
2017-08-29 10:09:13 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
342fd1d7fa
Alternative To Removing Kudzu Manufacturing ( #30080 )
2017-08-23 15:46:54 -05:00
