e8ddb7a4d7
why the fuck
2016-06-04 02:44:25 -07:00
b7034fe3f7
...
2016-06-04 02:42:24 -07:00
8b79a21698
why
2016-06-04 02:39:38 -07:00
607c4be5f9
hjope this works
2016-06-04 02:38:07 -07:00
4b2077fd6b
fortheloveofallthatisholyworkplease
2016-06-04 02:30:38 -07:00
d75ded29fa
Adds all-seeing-eye to necropolis chests. ( #18160 )
...
* Swaps xray syringe with new item.
* blankspace
* standards
2016-06-04 02:52:04 -05:00
65ba2d2800
Makes cloth not have force anymore. ( #18204 )
2016-06-04 01:23:29 -05:00
13dfd8dbf7
Peacekeepers now use Eye overlays, which means they close their eyes when they die :( ( #18209 )
...
Peacekeepers now have Eye overlays for being servants of Ratvar
Redid some of the shading and lineart for colours for Peacekeepers
2016-06-04 01:23:14 -05:00
ab6cadec73
Merge branch 'master' of https://github.com/tgstation/tgstation into barriershimmer
...
Conflicts:
icons/effects/effects.dmi
2016-06-04 00:19:18 -04:00
6fd1424619
Merge pull request #18085 from Xhuis/earsplitting_string
...
Clockwork Patch III
2016-06-03 19:55:04 -04:00
3f7f771fa1
Done and done
2016-06-03 19:42:02 -04:00
ee7ef0d4d7
Fixes experimentor doing many reactions with one event ( #18180 )
...
* Fix many reactions happening at once
* Small fix
2016-06-03 18:00:15 -05:00
e863e544a1
I can code guys I swear
2016-06-03 16:41:19 -04:00
b7b4cc01ed
Throwing Runtime Fix ( #18076 )
2016-06-03 22:22:03 +02:00
6ddc129392
YOU CAN'T HIDE FROM ME
2016-06-03 15:53:54 -04:00
a3c6571cfd
Fixes #18167 ( #18170 )
2016-06-03 14:48:32 -05:00
7c8603a0a8
important features ( #18195 )
2016-06-03 14:48:12 -05:00
4abcc87af4
Minor EfficiencyStation changes ( #18157 )
...
- Adds syringes and beakers to Xenobiology
- Replaces map edited grille-or-trash spawner with coded one
- Adds restroom to virology
2016-06-03 14:47:03 -05:00
a9a97f5a81
Fixes for Merge Tokens ( #18168 )
...
* fixes #15649
fixes #16575
* oops forgot those lines
2016-06-03 14:46:42 -05:00
64c19bd2d3
Adjusts RCD family export prices to be realistic ( #18186 )
...
Fixes #18101 . Comments indicate my rough logic, which brings them inline
with the actual cost of materials required to create them, rather than
x10 the amount.
Also still enables their sale rather than just crudely removing them
entirely.
2016-06-03 14:45:04 -05:00
143795d230
Fixes imprinter alone not working ( #18216 )
2016-06-03 14:43:52 -05:00
c45eea4ca9
Conflicts III
2016-06-03 15:43:17 -04:00
2b18993b04
Conflicts II
2016-06-03 15:42:19 -04:00
d40df77827
Conflicts I
2016-06-03 15:42:10 -04:00
adf47b8aa8
Two more small fixes
2016-06-03 15:40:19 -04:00
0ba90946dd
Uhh?
2016-06-03 15:09:17 -04:00
70795389df
More stuff, no conflict fix yet
2016-06-03 15:07:49 -04:00
afebc5ef97
Fixes ghost image runtime and see_darkness hiding ghosts again. ( #18158 )
...
(also fixes ghost images not garbage collecting.)
2016-06-03 16:49:08 +02:00
2a543c4e9d
Merge pull request #18166 from ChangelingRain/clangRATVARclang
...
Clockwork walls are slightly quieter
2016-06-03 23:58:07 +10:00
e4e091eb6e
Merge pull request #18161 from MrStonedOne/patch-210
...
Fixes things applying to the lighting object that shouldn't.
2016-06-03 08:56:45 -04:00
08f88fbe3e
Merge pull request #18159 from coiax/countdown
...
Adds ghost visible countdowns for bombs
2016-06-03 08:55:11 -04:00
d86ff169ef
Does the remie
2016-06-03 03:07:26 -07:00
bddfbcb5b6
Merge pull request #18131 from coiax/lazy-cloning
...
Clone pod code tidying and bugfixes
2016-06-03 17:26:16 +10:00
4c8f8ae53e
Merge pull request #18154 from PKPenguin321/plant-analyzer-repath
...
Repaths plant analyzers
2016-06-03 16:41:02 +10:00
e17d1f2c1f
Bug fixes for the cloner
...
🆑 coiax
bugfix: The cloning pod now sounds robotic on the radio.
/🆑
Also fixes some bugs where the clone pod didn't sound robotic
on the radio, and genericised the full screen colouring that
we (and cult airlocks) use.
2016-06-03 07:34:48 +01:00
8e88d2d329
removes obsoleted proc
2016-06-02 23:31:28 -07:00
49f812fada
Merge pull request #18149 from KorPhaeron/pAI
...
pAI ash storm immunity
2016-06-03 08:09:00 +03:00
303b0c2511
Barrier runes have a subtle shimmer while dense
2016-06-02 23:04:22 -04:00
60ea73bc37
Sanity check 2
2016-06-02 20:55:59 -04:00
685d938481
Some more work or something, idk
2016-06-02 20:53:51 -04:00
993bb73c1f
Merge pull request #18190 from tgstation/revert-18124-assoc-view
...
Revert "Variable viewer always expands assoc lists"
2016-06-03 10:49:03 +12:00
4c2cabd978
whoops
2016-06-02 17:34:51 -04:00
5c3c84dad8
Merge pull request #18137 from ChangelingRain/airblocked
...
False walls now block air
2016-06-03 09:29:08 +12:00
a899c28a24
Revert "Variable viewer always expands assoc lists"
2016-06-03 09:13:36 +12:00
fe25564d7f
Merge pull request #18124 from coiax/assoc-view
...
Variable viewer always expands assoc lists
2016-06-03 09:12:01 +12:00
803f414a95
Merge pull request #18130 from coiax/more-manipulator-stuff
...
Shuttle manipulator: Added "Fast Travel" button
2016-06-03 09:11:46 +12:00
bf73e69dce
Merge pull request #18141 from lzimann/temporarymarcial
...
Fix temporary martial arts not working properly when you already had another.
2016-06-03 09:10:40 +12:00
50c625a238
Merge pull request #18143 from lordpidey/Non_mobs_can_go_to_hell
...
Bolt of resurrection no longer runtimes on hitting non-mobs.
2016-06-03 09:10:27 +12:00
24056f9df3
Merge pull request #18146 from pudl/angela
...
Fixes smg magazines icon
2016-06-03 09:10:04 +12:00
4d091c010e
Adds Asteroid emergency shuttle to station ( #18125 )
...
Wow, this one is a WEIRD one.
2016-06-02 15:48:08 -05:00
kevinz000
TechnoAlchemist
Remie Richards
Nerd Lord
Xhuis
LatD
KorPhaeron
Iamgoofball
MMMiracles
coiax
Thunder12345
Kyle Spier-Swenson
Jordie
PKPenguin321
Razharas
oranges