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
6286f4d4c2
Merge branch 'master' into upstream-merge-32161
2017-11-11 23:02:13 -06:00
0513ce290e
Merge pull request #32428 from kevinz000/patch-374
...
Fixes spacevines causing negative pressure/temperature
2017-11-07 14:36:56 -06:00
ba1d3fd2c2
Merge pull request #32150 from MrStonedOne/patch-442
...
Meteor gating tweaks
2017-10-30 14:51:44 -05:00
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
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
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
4b297f509e
512 forward compatibility merge
2017-10-29 10:28:36 -05:00
39f683ab8d
Update meteor_wave.dm
2017-10-27 15:32:38 -05:00
12d336cbf0
Update halloween.dm
2017-10-27 15:32:15 -05:00
00163837de
Halloween Tweaks
2017-10-26 05:20:53 -05:00
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
5d20c88a5c
Update false_alarm.dm
2017-10-22 10:55:42 -05:00
03690f9d67
Update blob.dm
2017-10-22 10:51:21 -05:00
faf0e0a10a
Adds admin override for false alarm event.
2017-10-22 00:05:23 -05:00
c42e1b17f4
Blob fixes
2017-10-21 14:08:10 -05:00
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
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
c0e9cde5c2
Minor refactor of how gas IDs are handled
2017-10-12 00:30:09 -05:00
5be4669924
Datum antag wizard.
2017-10-11 05:24:17 -05:00
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
e7800a2235
Uses the proper list for xeno landmarks/nightmare spawning ( #31470 )
2017-10-09 16:00:24 -05:00
39728cc9b3
Nightmare spawn event ( #31376 )
...
* Nightmare Event
* Update nightmare.dm
* Standards
2017-10-07 08:41:25 -05:00
3b3b45c03c
Fixes/tweaks wormholes event and portals ( #30846 )
...
* fix
* THERE WE GO
* Update portals.dm
2017-10-03 04:37:35 -05:00
3e26e09db8
ismecha define
2017-10-02 01:04:53 -05:00
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
676abb946c
Update halloween.dm
2017-10-01 15:26:56 -05:00
f1f99fc26c
Update electrical_storm.dm
2017-10-01 15:26:32 -05:00
00aa312610
Update carp_migration.dm
2017-10-01 15:26:15 -05:00
6ca3deb8d1
Merge branch 'master' into upstream-merge-31129
2017-10-01 15:45:54 -04:00
cae3dd615d
Fixes events with sleeps.
2017-10-01 07:34:01 -05:00
2635689e79
Cleans up some antag/event landmark checks
2017-09-30 21:33:13 -05:00
04d071deda
Merge branch 'master' into upstream-merge-30763
2017-09-30 15:30:46 -04:00
77c2c77f0e
Removes a call to datum/New()
2017-09-29 15:59:19 -05:00
e5ef3d2405
Configuration datum refactor
2017-09-28 21:37:53 -05:00
7a0ffb8a67
Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888
...
[MIRROR] Refactors cinematics.
2017-09-27 23:42:35 -04:00
fd0bc465cc
Refactors cinematics.
2017-09-26 04:20:59 -05:00
34e186dadb
Datum abductors refactor
2017-09-24 18:00:49 -05:00
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
8a2ec7d39a
Update radiation_storm.dm
2017-09-14 13:32:48 -05:00
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
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
cd0997aa1e
Merge branch 'master' into upstream-merge-30297
2017-09-12 23:36:35 -05:00
97b25bc59a
Update vent_clog.dm
2017-09-11 15:58:12 -05:00
fe3d825596
Update spider_infestation.dm
2017-09-11 15:57:45 -05:00
12f17ecbe7
Update radiation_storm.dm
2017-09-11 15:57:15 -05:00
57343fa712
Update immovable_rod.dm
2017-09-11 15:56:25 -05:00
d05fdb0eb0
Makes the station Z level into a list instead of a single define
2017-09-11 12:40:35 -05:00
92b78d3298
[s] Adds a security token to all admin hrefs
2017-09-08 21:16:02 -05:00
8299cf576c
this sure was FUN
2017-09-07 09:47:56 -05:00
oranges