Commit Graph

8366 Commits

Author SHA1 Message Date
Jordan Brown
006b9c95f2 Removes unused consts from dbcore (#34711) 2018-01-21 21:15:17 -06:00
MoreRobustThanYou
c889a965df Fixes each monkey having it's own individual monkey_team (#34709)
* Fixes monkey teams

* Update monkey.dm
2018-01-21 21:15:09 -06:00
deathride58
9e6ce24a57 removes magic numbers from the set_light var in lights (#34714) 2018-01-21 21:13:57 -06:00
MMMiracles
372d6505ed make pretty light go light light (#34720) 2018-01-21 21:08:40 -06:00
KorPhaeron
3ef5dc14b5 Rebee atmos (#34723) 2018-01-21 21:07:28 -06:00
scrubs2009
fac6caffca Longer lasting candles. 2018-01-21 18:14:13 -06:00
Jordan Brown
5b7d74a80d Removes an unused proc 2018-01-21 18:13:02 -06:00
deathride58
28751ba370 Merge pull request #5001 from Citadel-Station-13/upstream-merge-34633
[MIRROR] Refactor weather to use Z traits, assorted related cleanup
2018-01-21 22:42:53 +00:00
deathride58
fafdad4ce9 Merge pull request #4999 from Citadel-Station-13/upstream-merge-34614
[MIRROR] Lets check_dock be silent
2018-01-21 22:41:33 +00:00
deathride58
625d46fa19 Merge pull request #4998 from Citadel-Station-13/upstream-merge-34606
[MIRROR] Config dir again except this time it works
2018-01-21 22:41:13 +00:00
deathride58
83135ca4e0 Merge pull request #4997 from Citadel-Station-13/upstream-merge-34567
[MIRROR] Fixes Revs & Clockcultists being valid for mindswap
2018-01-21 22:39:53 +00:00
deathride58
84b02025c9 Merge branch 'master' into upstream-merge-34686 2018-01-21 22:38:47 +00:00
deathride58
130b0f8d0d Merge pull request #4995 from Citadel-Station-13/upstream-merge-34695
[MIRROR] Fixes brother objectives not showing in TP
2018-01-21 22:37:52 +00:00
deathride58
038591d11f Merge pull request #4994 from Citadel-Station-13/upstream-merge-34629
[MIRROR] Fixes ghost show_hud runtime
2018-01-21 22:37:34 +00:00
deathride58
69b636f832 Merge pull request #4993 from Citadel-Station-13/upstream-merge-34692
[MIRROR] changes min players for revs to 30 from 20
2018-01-21 22:37:08 +00:00
deathride58
0ce61fb375 Merge pull request #4987 from Citadel-Station-13/upstream-merge-34674
[MIRROR] Fixes get_area_name runtime
2018-01-21 22:36:50 +00:00
LetterJay
c408f37b4c Update life.dm 2018-01-21 14:21:23 -06:00
LetterJay
574bc8fe25 Update title.dm 2018-01-21 14:20:22 -06:00
LetterJay
6094f87105 Update life.dm 2018-01-21 14:20:03 -06:00
LetterJay
923b72e138 Update ghost.dm 2018-01-21 14:19:48 -06:00
LetterJay
e02d7ae786 Update life.dm 2018-01-21 14:14:19 -06:00
Tad Hardesty
4451aca2e8 Refactor weather to use Z traits, assorted related cleanup (#34633)
* Add a proc for getting the station center

* Add a couple of comments to ZTRAIT defines

* Remove unused global_map list

* Refactor weather to use the trait system

* Un-hardcode the transit z-level

* Use Z traits to determine Portal Storm event areas

* Fix loading away missions containing anything that reads traits
2018-01-21 13:34:04 -06:00
Emmett Gaines
2054fc6433 lets check_dock be silent (#34614) 2018-01-21 12:34:42 -06:00
Jordan Brown
8dead1da6a Config dir again except this time it works 2018-01-21 12:32:29 -06:00
ShizCalev
68cfdb617b Fixes rev mindswap (#34567) 2018-01-21 12:29:12 -06:00
LetterJay
a074e10815 Merge pull request #4992 from Citadel-Station-13/upstream-merge-34679
[MIRROR] Fixes emergency lights literally never working
2018-01-21 12:01:43 -06:00
LetterJay
c18ce156e2 Merge pull request #4989 from Citadel-Station-13/upstream-merge-34625
[MIRROR] Brass skewer runtime fix
2018-01-21 11:56:50 -06:00
LetterJay
c158d2f6dd Update game.dm 2018-01-21 11:56:09 -06:00
LetterJay
d24a9d02d3 Merge pull request #4986 from Citadel-Station-13/upstream-merge-34497
[MIRROR] Adds holy vision (Some mobs can now see blessed tiles)
2018-01-21 11:55:52 -06:00
LetterJay
a415630f0e Merge pull request #4985 from Citadel-Station-13/upstream-merge-34515
[MIRROR] Gas Reagents dump out based on container temperature
2018-01-21 11:55:23 -06:00
LetterJay
a29c1bee0b Merge pull request #4984 from Citadel-Station-13/upstream-merge-34485
[MIRROR] Couple of chemistry fixes
2018-01-21 11:54:16 -06:00
LetterJay
15678c0ba7 Merge pull request #4983 from Citadel-Station-13/upstream-merge-34668
[MIRROR] Reinvigorates the disco inferno
2018-01-21 11:53:08 -06:00
LetterJay
b59c02f443 Merge pull request #4982 from Citadel-Station-13/upstream-merge-34630
[MIRROR] Cleans up some for's in ark_of_the_clockwork_justicar.dm
2018-01-21 11:52:41 -06:00
LetterJay
81b425eb24 Merge pull request #4979 from Citadel-Station-13/upstream-merge-34683
[MIRROR] Matched wirecutter colors
2018-01-21 11:50:07 -06:00
LetterJay
9840a18b5a Merge pull request #4975 from Citadel-Station-13/upstream-merge-34654
[MIRROR] Actually fixes wag emote runtime
2018-01-21 11:49:13 -06:00
LetterJay
7a43017325 Merge pull request #4974 from Citadel-Station-13/upstream-merge-34656
[MIRROR] Fixes missing MakeSlippery() args
2018-01-21 11:48:56 -06:00
LetterJay
e3df465eba Merge branch 'master' into upstream-merge-34667 2018-01-21 11:48:51 -06:00
LetterJay
886459dcc3 Merge pull request #4954 from Citadel-Station-13/upstream-merge-34591
[MIRROR] Fixes slimes attacking people with the slime faction
2018-01-21 11:48:07 -06:00
LetterJay
9bae4fdce0 Merge pull request #4949 from Citadel-Station-13/upstream-merge-34534
[MIRROR] Makes fire priority values defines
2018-01-21 11:47:41 -06:00
LetterJay
c5ec80819f Merge pull request #4943 from Citadel-Station-13/upstream-merge-34571
[MIRROR] Low memory mode
2018-01-21 11:47:27 -06:00
LetterJay
23742c18c5 Merge pull request #4929 from Citadel-Station-13/upstream-merge-34133
[MIRROR] Temperature Refactor and Fixes
2018-01-21 11:47:08 -06:00
Robustin
e1f4835b49 Ends the great monkey freezing epidemic 2018-01-21 09:23:24 -06:00
Jordan Brown
a7c9593aa6 Merge pull request #34695 from AnturK/brotherobjectivefix
Fixes brother objectives not showing in TP
2018-01-21 09:16:05 -06:00
Jordan Brown
c36b095146 Fixes ghost show_hud runtime 2018-01-21 09:14:50 -06:00
Jordan Brown
0558e83ff8 Merge pull request #34692 from Tlaltecuhtli/revs
changes min players for revs to 30 from 20
2018-01-21 09:13:37 -06:00
Jordan Brown
805a07de7e Merge pull request #34679 from Xhuis/patch-3
Fixes emergency lights literally never working
2018-01-21 09:10:20 -06:00
ShizCalev
af995d8683 Brass skewer runtime fix 2018-01-21 02:57:17 -06:00
ShizCalev
f59a365c23 Fixes get_area_name runtime 2018-01-21 02:55:53 -06:00
Dax Dupont
4826dec880 Adds holy vision (Some mobs can now see blessed tiles) (#34497)
* Blessed turfs are visible to people who care about blessed turfs

* A better way

* Adds holy vision

* Compacts special types

* space space space

* Glowing

* Final Solution

* wraith

* bawhoppen has autism and we must hugbox

* Implements feedback
2018-01-21 02:04:47 -06:00
BordListian
2abbd8cc89 - Changes gas reagents (liquid plasma, oxygen, etc) to emit gas based on chem temperature instead of at room temperature when dumped. (#34515) 2018-01-21 02:04:40 -06:00