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

4805 Commits

Author SHA1 Message Date
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
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
MoreRobustThanYou
88b4a41fe2 Reduces spaces in the Lepidopterian language. 2018-01-21 21:15:25 -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
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
84b02025c9 Merge branch 'master' into upstream-merge-34686 2018-01-21 22:38:47 +00:00
LetterJay
c408f37b4c Update life.dm 2018-01-21 14:21:23 -06:00
LetterJay
6094f87105 Update life.dm 2018-01-21 14:20:03 -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
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
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
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
805a07de7e Merge pull request #34679 from Xhuis/patch-3 
Fixes emergency lights literally never working
 2018-01-21 09:10:20 -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
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
097f2b2ddf Update life.dm 2018-01-20 13:18:25 -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
0042517af9 Merge pull request #34649 from ShizCalev/spider-nutriment-typo 
Fixes spider reagents typo
 2018-01-20 09:48:44 -06:00
MrDoomBringer
449c7d79df Cargotechs now spawn with Export Scanners (#34595) 
* excessiveuseof[b]obblestone

* whups

* praisenarsie
 2018-01-19 22:32:17 -06:00
Leo
945358fbfd Merge pull request #34605 from ShizCalev/kinetic_accelerator-runtimes 
Fixes some kinetic accelerator runtimes
 2018-01-19 19:47:21 -06:00
XDTM
b13be9240c Fixes slimes not attacking anybody 2018-01-19 19:29:52 -06:00
deathride58
28147de16a Merge pull request #4960 from Citadel-Station-13/upstream-merge-34501 
[MIRROR] Allow mapping non-default scrubbers
 2018-01-19 19:44:00 +00:00
deathride58
4077ec6713 Merge pull request #4957 from Citadel-Station-13/upstream-merge-34641 
[MIRROR] Fixes conveyor belt power usage.
 2018-01-19 19:43:33 +00:00
deathride58
26bca66519 Merge pull request #4956 from Citadel-Station-13/upstream-merge-34547 
[MIRROR] Jaunt Direction Fix
 2018-01-19 19:43:14 +00:00
deathride58
2d3e79ab44 Merge pull request #4952 from Citadel-Station-13/upstream-merge-34574 
[MIRROR] Added observer verb View Gases
 2018-01-19 19:42:18 +00:00
deathride58
78d31edc6c Merge pull request #4947 from Citadel-Station-13/upstream-merge-34557 
[MIRROR] Fixes cancelling equipment selection being equivalent to selecting "Naked"
 2018-01-19 19:39:42 +00:00
deathride58
ede18e6fec Merge pull request #4946 from Citadel-Station-13/upstream-merge-34598 
[MIRROR] Illusions now properly use the health argument of Copy_Parent
 2018-01-19 19:39:26 +00:00
deathride58
29099c3608 Merge pull request #4945 from Citadel-Station-13/upstream-merge-34569 
[MIRROR] Fixes bananium ore sprite
 2018-01-19 19:39:07 +00:00