Commit Graph

3142 Commits

Author SHA1 Message Date
Iamgoofball
e862c1138e >people think burn victims are better than literally-cant-see-shit (#34734) 2018-01-22 13:06:32 -06: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
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
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
Tad Hardesty
4f33c20fba Fix radio jammers affecting other z-levels (#34705) 2018-01-21 21:18:00 -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
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
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
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
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
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
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
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
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
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
ShizCalev
af995d8683 Brass skewer runtime fix 2018-01-21 02:57:17 -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
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
bb51095b00 Merge pull request #34656 from ShizCalev/makeslippery
Fixes missing MakeSlippery() args
2018-01-20 14:09:49 -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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
2906e24f56 Merge pull request #4961 from Citadel-Station-13/upstream-merge-34551
[MIRROR] fixes supply drop pods being impossible to dissassemble
2018-01-19 19:44:18 +00:00
deathride58
8d8790f4d8 Merge pull request #4950 from Citadel-Station-13/upstream-merge-34513
[MIRROR] Move roundid and schema check to dbcore subsystem
2018-01-19 19:41:36 +00:00
deathride58
c12422564f Merge pull request #4944 from Citadel-Station-13/upstream-merge-34601
[MIRROR] TTVs are too big to fit in bags
2018-01-19 19:38:54 +00:00
deathride58
98cc937b40 Merge pull request #4940 from Citadel-Station-13/upstream-merge-34626
[MIRROR] Fixes borg cell recharging runtime
2018-01-19 19:36:47 +00:00
deathride58
ec9f66e32e Merge pull request #4938 from Citadel-Station-13/upstream-merge-34452
[MIRROR] Reduce the volume of the death sound on clock work mobs
2018-01-19 19:36:18 +00:00
deathride58
8f358b6313 Merge pull request #4935 from Citadel-Station-13/upstream-merge-34639
[MIRROR] Fixes autolathe power consumption
2018-01-19 19:35:12 +00:00
deathride58
82353abaa6 Merge pull request #4933 from Citadel-Station-13/upstream-merge-34573
[MIRROR] Fixes the diagonal sliding
2018-01-19 19:34:31 +00:00
deathride58
e944dbef9c Merge pull request #4930 from Citadel-Station-13/upstream-merge-34236
[MIRROR] Antag Panel / Check antagonists Refactor
2018-01-19 19:33:25 +00:00
Jordan Brown
7a6796eb76 Merge pull request #34620 from ShizCalev/color-correction
Corrects tile color defines
2018-01-19 12:24:00 -06:00
Ashe Higgs
c9224a3185 allows servants to cancel warps more intuitively by clicking on the button again (#34504)
* lets you cancel cc warps

* runtimestation
2018-01-19 09:57:57 -06:00
kevinz000
b7df40727d You can now buckle people to target stakes (#34514)
* Update target_stake.dm

* Update target_stake.dm

* Update target_stake.dm
2018-01-19 09:52:42 -06:00
Jordan Brown
5e58abca3a Merge pull request #34551 from MrDoomBringer/DropItLikeItsHottest
fixes supply drop pods being impossible to dissassemble
2018-01-19 09:43:21 -06:00
Jordan Brown
bcfbe4d14a Merge pull request #34513 from optimumtact/hostwiththemost
Move roundid and schema check to dbcore subsystem
2018-01-19 09:18:52 -06:00
Jordan Brown
3cb5b20709 Merge pull request #34601 from KorPhaeron/bomb
TTVs are too big to fit in bags
2018-01-19 09:12:45 -06:00
Jordan Brown
495bbb0101 Merge pull request #34626 from ShizCalev/borg-recharge-runtime
Fixes borg cell recharging runtime
2018-01-19 09:00:50 -06:00