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
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
6c4d687db6
Immovable rod abuse, smite and event trigger. ( #33681 )
2017-12-21 00:11:20 -06:00
92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
9ab75d37b7
Update operative.dm
2017-12-19 19:35:41 -06:00
bcbb4102bf
Update disease_outbreak.dm
2017-12-19 18:50:43 -06:00
63b1b1df88
Update disease_outbreak.dm
2017-12-19 18:40:20 -06:00
56737f32de
Update disease_outbreak.dm
2017-12-19 17:59:55 -06:00
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
516db4851f
Update disease_outbreak.dm
2017-12-19 16:53:21 -06:00
16f1a07b92
diseases
2017-12-19 16:41:09 -06:00
e6aaad1921
Update disease_outbreak.dm
2017-12-17 15:58:06 -06:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
7d1485643e
Fixes race swap ( #33566 )
2017-12-17 04:11:40 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
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
6bfca33a78
Roundend report refactor
2017-12-11 10:58:23 -06:00
746e57bd86
Allowed shuttle docking ports to be hidden from some shuttle docking computers
2017-12-10 14:23:08 -06:00
f7d5ab5baf
Fixes some broken random events ( #33345 )
2017-12-08 10:34:50 -06:00
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
2762e3b530
Fixes Lord Singuloth hungering for more than he should
2017-11-24 13:00:42 -06:00
889defd2ce
Update _event.dm
2017-11-22 14:29:13 -05:00
1f6b3ce629
Merge branch 'master' into upstream-merge-32188
2017-11-21 19:53:58 +00:00
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
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
2498e1ddc0
Cleans up unused code
2017-11-20 10:14:32 -06:00
eeba86e27e
Merge branch 'master' into upstream-merge-32188
2017-11-18 05:31:42 +00:00
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
127846549d
Update mass_hallucination.dm
2017-11-17 23:21:13 -05:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
fc90cf5344
Removed unused HTML tags ( #32787 )
2017-11-16 17:08:51 -06:00
6ce69fb2c8
Replaces a bunch of mob loops with hopefully better ones
2017-11-16 16:09:15 -06:00
304cfeb262
Merge pull request #3914 from Citadel-Station-13/upstream-merge-31947
...
[MIRROR] Pirate ship event
2017-11-13 11:52:40 -06:00
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
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
4f5a728415
Update weightless.dm
2017-11-12 08:12:54 -06:00
c7a25534e4
Update spontaneous_appendicitis.dm
2017-11-12 08:12:43 -06:00
65daec8f75
Update prison_break.dm
2017-11-12 08:12:32 -06:00
a29c317a1d
Update mass_hallucination.dm
2017-11-12 08:12:21 -06:00
eb193ef22b
Update ion_storm.dm
2017-11-12 08:12:11 -06:00
e8e18ebc5f
Update friday13th.dm
2017-11-12 08:11:50 -06:00
3ae0051dc7
Update dust.dm
2017-11-12 08:11:41 -06:00
475e604892
Update communications_blackout.dm
2017-11-12 08:11:28 -06:00
a5a7b92897
Update anomaly_vortex.dm
2017-11-12 08:11:14 -06:00
c311b6c87e
Update anomaly_grav.dm
2017-11-12 08:11:06 -06:00
3b6e596a45
Update anomaly_flux.dm
2017-11-12 08:10:56 -06:00
1be11114c5
Update anomaly_bluespace.dm
2017-11-12 08:10:48 -06:00
fdb3324a4b
Update anomaly.dm
2017-11-12 08:10:37 -06:00
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
CitadelStationBot