LetterJay
62a9649a98
Update disease_outbreak.dm
2017-12-25 05:23:37 -06:00
LetterJay
7b40f3f0e0
Update disease_outbreak.dm
2017-12-25 05:09:21 -06:00
LetterJay
ac5503d338
Merge branch 'master' into upstream-merge-33055
2017-12-25 04:10:34 -06:00
CitadelStationBot
938f409782
[MIRROR] Christmas ( #4491 )
...
* Christmas (#33690 )
* Christmas Event Updates
* Dont recreate the list every time
* Check for drop del
* Changes some things to placate that one guy from FTL
* Christmas
2017-12-22 13:14:25 -08:00
LetterJay
8ea38cfde2
Merge pull request #4474 from Citadel-Station-13/upstream-merge-33681
...
[MIRROR] Immovable rod abuse, smite and event trigger.
2017-12-21 04:55:32 -06:00
AnturK
6c4d687db6
Immovable rod abuse, smite and event trigger. ( #33681 )
2017-12-21 00:11:20 -06:00
LetterJay
92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
LetterJay
9ab75d37b7
Update operative.dm
2017-12-19 19:35:41 -06:00
LetterJay
bcbb4102bf
Update disease_outbreak.dm
2017-12-19 18:50:43 -06:00
LetterJay
63b1b1df88
Update disease_outbreak.dm
2017-12-19 18:40:20 -06:00
LetterJay
56737f32de
Update disease_outbreak.dm
2017-12-19 17:59:55 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
LetterJay
516db4851f
Update disease_outbreak.dm
2017-12-19 16:53:21 -06:00
LetterJay
16f1a07b92
diseases
2017-12-19 16:41:09 -06:00
LetterJay
fa0bcde791
Update disease_outbreak.dm
2017-12-18 17:24:49 -06:00
XDTM
3af0aa2489
[Ready Again]Refactors disabilities into lists, allowing for independent disability sources
2017-12-18 15:19:53 -06:00
LetterJay
e6aaad1921
Update disease_outbreak.dm
2017-12-17 15:58:06 -06:00
Emmett Gaines
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
Robustin
7d1485643e
Fixes race swap ( #33566 )
2017-12-17 04:11:40 -06:00
LetterJay
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
CitadelStationBot
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
AnturK
6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
Cruix
746e57bd86
Allowed shuttle docking ports to be hidden from some shuttle docking computers
2017-12-10 14:23:08 -06:00
YPOQ
f7d5ab5baf
Fixes some broken random events ( #33345 )
2017-12-08 10:34:50 -06:00
Y0SH1M4S73R
86fca33d06
Cleans up a double assignment ( #33048 )
...
* Fixes component runtimes (#33045 )
* fixes an internally redundant assignment statement
2017-11-24 22:29:53 -06:00
ShizCalev
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
deathride58
889defd2ce
Update _event.dm
2017-11-22 14:29:13 -05:00
deathride58
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
deathride58
d2b251d23c
Merge pull request #4041 from Citadel-Station-13/upstream-merge-32844
...
[MIRROR] Cleans up unused code
2017-11-21 04:15:11 +00:00
AnturK
70c7996986
Fixes abductor teams getting assigned to same pod ( #32859 )
...
* Fixes abductors getting assigned to same team
* Remove explicit null return
2017-11-20 19:36:10 -06:00
Jordan Brown
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
deathride58
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
deathride58
9e78bcd8f9
Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786
...
[MIRROR] Replaces a bunch of mob loops with hopefully better ones
2017-11-18 05:29:32 +00:00
deathride58
127846549d
Update mass_hallucination.dm
2017-11-17 23:21:13 -05:00
Jordie
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
Matt Smith
fc90cf5344
Removed unused HTML tags ( #32787 )
2017-11-16 17:08:51 -06:00
vuonojenmustaturska
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
LetterJay
304cfeb262
Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
...
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
LetterJay
97757d2c87
Merge pull request #3894 from Citadel-Station-13/upstream-merge-32559
...
[MIRROR] Makes false alarm use more explicit in event code.
2017-11-13 11:42:53 -06:00
oranges
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
LetterJay
4f5a728415
Update weightless.dm
2017-11-12 08:12:54 -06:00
LetterJay
c7a25534e4
Update spontaneous_appendicitis.dm
2017-11-12 08:12:43 -06:00
LetterJay
65daec8f75
Update prison_break.dm
2017-11-12 08:12:32 -06:00
LetterJay
a29c317a1d
Update mass_hallucination.dm
2017-11-12 08:12:21 -06:00
LetterJay
eb193ef22b
Update ion_storm.dm
2017-11-12 08:12:11 -06:00
LetterJay
e8e18ebc5f
Update friday13th.dm
2017-11-12 08:11:50 -06:00
LetterJay
3ae0051dc7
Update dust.dm
2017-11-12 08:11:41 -06:00
LetterJay
475e604892
Update communications_blackout.dm
2017-11-12 08:11:28 -06:00
LetterJay
a5a7b92897
Update anomaly_vortex.dm
2017-11-12 08:11:14 -06:00
