shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,451 Commits 5 Branches 0 Tags
fadeecaf40aa74f0d4e2c2f0512d749e322df871
Commit Graph

8136 Commits

Author SHA1 Message Date
deathride58
fadeecaf40 Merge pull request #4968 from Citadel-Station-13/upstream-merge-34667 
[MIRROR] Fixes slimes not attacking anybody
 2018-01-22 06:25:14 +00:00
deathride58
5121a272d2 Merge pull request #5003 from Citadel-Station-13/upstream-merge-34717 
[MIRROR] Longer lasting candles.
 2018-01-22 06:24:35 +00:00
LetterJay
b87972b15c Merge pull request #5014 from Citadel-Station-13/upstream-merge-34314 
[MIRROR] Datum var cleanup
 2018-01-21 23:14:18 -06:00
LetterJay
e374b7f575 Merge pull request #5013 from Citadel-Station-13/upstream-merge-34636 
[MIRROR] Adds the camera and it's film to the autolathe and changes the materials on them
 2018-01-21 23:13:53 -06:00
LetterJay
fac7b08506 Merge pull request #5012 from Citadel-Station-13/upstream-merge-34705 
[MIRROR] Fix radio jammers affecting other z-levels
 2018-01-21 23:13:24 -06:00
LetterJay
e8ec0580d1 Merge pull request #5011 from Citadel-Station-13/upstream-merge-34697 
[MIRROR] Fixes holes in station showing up white on photos.
 2018-01-21 23:13:07 -06:00
LetterJay
61b0c699bf Merge pull request #5009 from Citadel-Station-13/upstream-merge-34712 
[MIRROR] Reduces spaces in the Lepidopterian language.
 2018-01-21 23:12:21 -06:00
LetterJay
f3e4ba69ec Merge pull request #5008 from Citadel-Station-13/upstream-merge-34711 
[MIRROR] Removes unused consts from dbcore
 2018-01-21 23:11:56 -06:00
LetterJay
e9e357d3de Merge pull request #5007 from Citadel-Station-13/upstream-merge-34709 
[MIRROR] Fixes each monkey having it's own individual monkey_team
 2018-01-21 23:11:37 -06:00
LetterJay
b1ee30d46e Merge pull request #5006 from Citadel-Station-13/upstream-merge-34714 
[MIRROR] Removes magic numbers from the set_light calls in light fixtures
 2018-01-21 23:11:20 -06:00
LetterJay
1beea71328 Merge pull request #5005 from Citadel-Station-13/upstream-merge-34720 
[MIRROR] Syndicate+Pirate mobs now give off light if appropriate
 2018-01-21 23:10:57 -06:00
LetterJay
9a96950032 Merge pull request #5004 from Citadel-Station-13/upstream-merge-34723 
[MIRROR] City of cogs atmos is now planetary, slowly resets
 2018-01-21 23:10:35 -06:00
LetterJay
5aaba3c138 Merge pull request #5002 from Citadel-Station-13/upstream-merge-34715 
[MIRROR] Removes an unused proc
 2018-01-21 23:10:14 -06:00
LetterJay
6b998377ca Merge pull request #4996 from Citadel-Station-13/upstream-merge-34686 
[MIRROR] Ends the great monkey freezing epidemic
 2018-01-21 23:10:00 -06:00
LetterJay
84b9c4bb2b Update life.dm 2018-01-21 23:09:22 -06:00
LetterJay
61c245ebef Update candle.dm 2018-01-21 23:07:11 -06:00
Jordan Brown
e84617f17b Datum var cleanup (#34314) 
* Consolidates datum var location

* Move ui_screen to /datum/tgui

* Move focusers to datum.dm. Move fingerprintslast to /atom

* Remove focusers list, makes mobs check if their focus is QDELETED in Life()

* Consolidate use_tag and var_edited into datum_flags

* Revert garbage comment

* Thought I already removed this

* Remove the var_edited preservation

* Removes focus QDELETED handling
 2018-01-21 21:39:46 -06:00
Dax Dupont
c2f5a85394 Adds the camera to the autolathe and changes the materials (#34636) 2018-01-21 21:24:18 -06:00
Tad Hardesty
4f33c20fba Fix radio jammers affecting other z-levels (#34705) 2018-01-21 21:18:00 -06:00
AnturK
22f64c3b1f Fixes holes in station showing up white on photos. (#34697) 2018-01-21 21:17:49 -06:00
MoreRobustThanYou
88b4a41fe2 Reduces spaces in the Lepidopterian language. 2018-01-21 21:15:25 -06:00
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