shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,385 Commits 5 Branches 0 Tags
84b02025c9743c42483320bf1bce38f54c8a5c60
Commit Graph
8094 Commits
Author SHA1 Message Date
deathride58andGitHub 84b02025c9 Merge branch 'master' into upstream-merge-34686 2018-01-21 22:38:47 +00:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
LetterJayandGitHub 6094f87105 Update life.dm 2018-01-21 14:20:03 -06:00
LetterJayandGitHub 923b72e138 Update ghost.dm 2018-01-21 14:19:48 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub c158d2f6dd Update game.dm 2018-01-21 11:56:09 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 81b425eb24 Merge pull request #4979 from Citadel-Station-13/upstream-merge-34683 
[MIRROR] Matched wirecutter colors
 2018-01-21 11:50:07 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub c5ec80819f Merge pull request #4943 from Citadel-Station-13/upstream-merge-34571 
[MIRROR] Low memory mode
 2018-01-21 11:47:27 -06:00
LetterJayandGitHub 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
RobustinandCitadelStationBot e1f4835b49 Ends the great monkey freezing epidemic 2018-01-21 09:23:24 -06:00
Jordan BrownandCitadelStationBot a7c9593aa6 Merge pull request #34695 from AnturK/brotherobjectivefix 
Fixes brother objectives not showing in TP
 2018-01-21 09:16:05 -06:00
Jordan BrownandCitadelStationBot c36b095146 Fixes ghost show_hud runtime 2018-01-21 09:14:50 -06:00
Jordan BrownandCitadelStationBot 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 BrownandCitadelStationBot 805a07de7e Merge pull request #34679 from Xhuis/patch-3 
Fixes emergency lights literally never working
 2018-01-21 09:10:20 -06:00
ShizCalevandCitadelStationBot af995d8683 Brass skewer runtime fix 2018-01-21 02:57:17 -06:00
ShizCalevandCitadelStationBot f59a365c23 Fixes get_area_name runtime 2018-01-21 02:55:53 -06:00
Dax DupontandCitadelStationBot 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
BordListianandCitadelStationBot 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
BordListianandCitadelStationBot 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
ShizCalevandCitadelStationBot a0098744c8 Reinvigorates the disco inferno 2018-01-21 01:29:42 -06:00
ShizCalevandCitadelStationBot 0a98435694 Fixed runtimes 2018-01-21 01:24:26 -06:00
ShizCalevandCitadelStationBot 4a53b5f4a9 Matched wirecutter colors 2018-01-21 01:20:52 -06:00
Jordan BrownandCitadelStationBot b2d7044eb9 Merge pull request #34654 from ShizCalev/tailwag-fix 
Actually fixes wag emote runtime
 2018-01-20 14:09:58 -06:00
Jordan BrownandCitadelStationBot bb51095b00 Merge pull request #34656 from ShizCalev/makeslippery 
Fixes missing MakeSlippery() args
 2018-01-20 14:09:49 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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 BrownandCitadelStationBot d57f616131 Merge pull request #34631 from uraniummeltdown/airlock 
Emagged Airlocks Are Easier To Deconstruct
 2018-01-20 09:50:00 -06:00
Jordan BrownandCitadelStationBot 0042517af9 Merge pull request #34649 from ShizCalev/spider-nutriment-typo 
Fixes spider reagents typo
 2018-01-20 09:48:44 -06:00
MrDoomBringerandCitadelStationBot 449c7d79df Cargotechs now spawn with Export Scanners (#34595) 
* excessiveuseof[b]obblestone

* whups

* praisenarsie
 2018-01-19 22:32:17 -06:00
LeoandCitadelStationBot 945358fbfd Merge pull request #34605 from ShizCalev/kinetic_accelerator-runtimes 
Fixes some kinetic accelerator runtimes
 2018-01-19 19:47:21 -06:00
deathride58andGitHub 10e6de7421 Merge pull request #4920 from Citadel-Station-13/upstream-merge-34603 
[MIRROR] Revert "Fix config_dir usage (#34469)"
 2018-01-19 19:52:36 +00:00
deathride58andGitHub 9eada1167b Merge pull request #4965 from Citadel-Station-13/upstream-merge-34620 
[MIRROR] Corrects tile color defines
 2018-01-19 19:46:56 +00:00
deathride58andGitHub f6dbe3ea58 Merge pull request #4963 from Citadel-Station-13/upstream-merge-34504 
[MIRROR] allows servants to cancel warps more intuitively by clicking on the button again
 2018-01-19 19:45:23 +00:00
deathride58andGitHub 1a9e1b36a1 Merge pull request #4962 from Citadel-Station-13/upstream-merge-34514 
[MIRROR] You can now buckle people to target stakes
 2018-01-19 19:44:39 +00:00