cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,398 Commits 55 Branches 0 Tags
d9a0133a969f0a00c0e40a435f199f16fb9e84e0
Commit Graph

8100 Commits

Author SHA1 Message Date
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
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
574bc8fe25 Update title.dm 2018-01-21 14:20:22 -06:00
LetterJay
923b72e138 Update ghost.dm 2018-01-21 14:19:48 -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
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
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
BordListian
8d5d7d1d50 - Fixes smoke and foam having 1/4th of the reagents they should have (yoooo) 
- Fixes copy_to runtiming if you transfer from a container that contains nothing directly to a reagents datum
- Removes redundant total_volume check in trans_to
- Fixes cryostylane and pyrosium not heating up people
- Fixes cryostylane cooling beakers to negative kelvins
- Fixes cryostylane cooling people to negative kelvins (stop copypasting code for temperature)
 2018-01-21 02:01:26 -06:00
ShizCalev
a0098744c8 Reinvigorates the disco inferno 2018-01-21 01:29:42 -06:00
ShizCalev
0a98435694 Fixed runtimes 2018-01-21 01:24:26 -06:00
ShizCalev
4a53b5f4a9 Matched wirecutter colors 2018-01-21 01:20:52 -06:00
Jordan Brown
b2d7044eb9 Merge pull request #34654 from ShizCalev/tailwag-fix 
Actually fixes wag emote runtime
 2018-01-20 14:09:58 -06:00
Jordan Brown
bb51095b00 Merge pull request #34656 from ShizCalev/makeslippery 
Fixes missing MakeSlippery() args
 2018-01-20 14:09:49 -06:00
LetterJay
aebac8692e Merge pull request #4973 from Citadel-Station-13/upstream-merge-34631 
[MIRROR] Emagged Airlocks Are Easier To Deconstruct
 2018-01-20 13:17:50 -06:00
LetterJay
26fb702233 Merge pull request #4972 from Citadel-Station-13/upstream-merge-34649 
[MIRROR] Fixes spider reagents typo
 2018-01-20 13:17:35 -06:00
LetterJay
5f7cc68e40 Merge pull request #4970 from Citadel-Station-13/upstream-merge-34595 
[MIRROR] Cargotechs now spawn with Export Scanners
 2018-01-20 13:16:07 -06:00
LetterJay
a8055123b6 Merge pull request #4969 from Citadel-Station-13/upstream-merge-34605 
[MIRROR] Fixes some kinetic accelerator runtimes
 2018-01-20 13:15:53 -06:00
LetterJay
a53dc16ae8 stop 2018-01-20 11:32:20 -06:00
Jordan Brown
d57f616131 Merge pull request #34631 from uraniummeltdown/airlock 
Emagged Airlocks Are Easier To Deconstruct
 2018-01-20 09:50:00 -06:00
Jordan Brown
0042517af9 Merge pull request #34649 from ShizCalev/spider-nutriment-typo 
Fixes spider reagents typo
 2018-01-20 09:48:44 -06:00