Commit Graph

735 Commits

Author SHA1 Message Date
LetterJay 083100a4df Merge branch 'master' into upstream-merge-32570 2017-11-13 11:45:39 -06:00
LetterJay 9a80e5f91c Merge pull request #3893 from Citadel-Station-13/upstream-merge-32582
[MIRROR] Fixes 512 compile reminders
2017-11-13 11:42:40 -06:00
LetterJay 34b3607211 Merge pull request #3867 from Citadel-Station-13/upstream-merge-32504
[MIRROR] Weakrefs
2017-11-13 11:41:38 -06:00
LetterJay 3e55cec1b0 Merge pull request #3862 from Citadel-Station-13/upstream-merge-32498
[MIRROR] Fixes VV not displaying false values in keyed lists
2017-11-13 11:41:18 -06:00
oranges 51b0c286a9 Fixes readapt removing hivemind communication. 2017-11-13 03:20:50 -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
Ashe Higgs 9dff28b50d Improves the deep fryer 2017-11-13 03:16:11 -06:00
LetterJay 7e6283a3f0 Merge branch 'master' into upstream-merge-32504 2017-11-12 23:11:53 -06:00
LetterJay a62be6b939 Merge branch 'master' into upstream-merge-32498 2017-11-12 23:10:50 -06:00
LetterJay 14944d8711 Merge branch 'master' into upstream-merge-32183 2017-11-12 23:09:55 -06:00
LetterJay 9fefd15f66 Merge branch 'master' into upstream-merge-32247 2017-11-12 23:09:10 -06:00
LetterJay b5051323aa Merge branch 'master' into upstream-merge-32221 2017-11-12 23:08:17 -06:00
kevinz000 2180c4c1fe Checks for nulls in weakrefs 2017-11-12 18:00:02 -06:00
LetterJay 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
Emmett Gaines 95707bf1b7 fixes 512 compile reminders (#32582) 2017-11-11 14:33:22 -06:00
swindly 3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
LetterJay 6df47bed08 Update datumvars.dm 2017-11-09 03:15:20 -06:00
kevinz000 b44e31951d Weakrefs 2017-11-09 00:49:01 -06:00
Emmett Gaines 70d75c3988 fixes radioactive half life (#32511) 2017-11-09 00:45:40 -06:00
ACCount becfcb1dd2 Fixes VV not displaying false values in keyed lists 2017-11-08 19:52:15 -06:00
LetterJay 448326cd60 Merge pull request #3856 from Citadel-Station-13/upstream-merge-32466
[MIRROR] Fixes turf_decal layering
2017-11-08 02:21:13 -06:00
ShizCalev 88e7e8d2cb Fixes turf_decal layering 2017-11-07 21:38:53 -06:00
Emmett Gaines 8fb5936c30 fixes null parent in destroy for components (#32351)
* fixes parent being null in destroy

* extends qdel
2017-11-07 14:35:46 -06:00
LetterJay 1f2af245c8 Merge pull request #3829 from Citadel-Station-13/upstream-merge-32424
[MIRROR] Mining zlevel has a bomb cap of three times the configured cap
2017-11-07 04:44:31 -06:00
LetterJay 2d07daca49 Merge pull request #3824 from Citadel-Station-13/upstream-merge-32417
[MIRROR] Fixes EMP wire pulsing
2017-11-07 04:41:55 -06:00
LetterJay f8d96d8692 Update mind.dm 2017-11-07 03:26:48 -06:00
AnturK 2e0aaf8598 Ling datum antag standarization. 2017-11-05 19:32:59 -06:00
oranges aa79fdd492 Merge pull request #32424 from lzimann/zlevelcapmultiplier
Mining zlevel has a bomb cap of three times the configured cap
2017-11-05 15:13:11 -06:00
Jordan Brown bd69a59bad Merge pull request #32417 from YPOQ/empwirefix
Fixes EMP wire pulsing
2017-11-05 12:03:42 -06:00
Emmett Gaines 5bcc90d3c1 removes search_contents_for proc (#32411) 2017-11-05 02:07:16 -06:00
LetterJay 6c1347366a Merge pull request #3792 from Citadel-Station-13/upstream-merge-32342
[MIRROR] Fixes golem shells breaking spawners menu
2017-11-04 22:47:59 -05:00
AnturK bd42e162c5 Fixes golem shells breaking spawners menu (#32342) 2017-11-03 17:37:20 -05:00
Jordan Brown 03e7e0e58c Cleans up signal redirector (#32368) 2017-11-03 15:53:18 -05:00
Emmett Gaines ec597c411e Signal redirection component (#32298)
* redirection component

* makes register signal accept callbacks

* this is a very lightweight component
2017-11-02 16:05:04 -05:00
CitadelStationBot 9bda3f16c2 Merge pull request #3735 from Citadel-Station-13/upstream-merge-31942
[MIRROR] Shuttle rotation refactor and significant performance upgrade
2017-11-02 04:06:31 -05:00
LetterJay d9a29dbda2 Merge branch 'master' into upstream-merge-32307 2017-11-01 07:22:39 -04:00
LetterJay eb8b49071a Merge pull request #3725 from Citadel-Station-13/upstream-merge-32158
[MIRROR] Replace most islist calls in components with length()
2017-11-01 01:42:42 -04:00
oranges 17873819b3 Adds a temporary workaround for a BYOND bug 2017-10-31 21:20:13 -05:00
Emmett Gaines a9f07518a7 Shuttle rotation refactor and significant performance upgrade 2017-10-31 20:23:57 -05:00
oranges c5e11eceed Some minor contamination fixes 2017-10-31 15:30:53 -05:00
Jordan Brown 55653fa1ee Replace most islist calls in components with length() (#32158)
islist was used to check if a thing was

A. A list of things
B. 1 thing

length was profiled to be faster
2017-10-31 15:12:42 -05:00
Jordan Brown 0e037767cd Minor optimization for _GetInverseTypeList (#32155)
* Minor optimization for _GetInverseTypeList

* We also need to make sure the root component is never instantiated to avoid stack overflows
2017-10-31 15:11:25 -05:00
LetterJay 5dd64d3423 Merge branch 'master' into upstream-merge-32221 2017-10-31 07:58:54 -04:00
Emmett Gaines 6f940baa0a New ambience for ash storms (#32213)
song name?
2017-10-30 15:22:23 -05:00
Jordan Brown 487f2a88c5 Fixes allow_custom_shuttles default 2017-10-30 15:21:11 -05:00
Jordan Brown 47f88be07f Fixes TakeComponent (#32156)
* Fixes TakeComponent

* Add the note about OnTransfer and COMPONENT_INCOMPATIBLE

* Fix behaviour

* Missed datum.dm
2017-10-30 03:53:00 -05:00
LetterJay f1002a7109 Merge pull request #3672 from Citadel-Station-13/upstream-merge-32206
[MIRROR] Fixes map_config validation
2017-10-30 00:00:31 -04:00
LetterJay 4d3211f273 Merge pull request #3675 from Citadel-Station-13/upstream-merge-32185
[MIRROR] Fixes TP wizarding.
2017-10-29 23:37:30 -04:00
LetterJay 84272ea241 Merge branch 'master' into upstream-merge-32206 2017-10-29 23:36:39 -04:00
LetterJay b6f0423840 Update map_config.dm 2017-10-29 22:23:17 -05:00