Jordan Brown
13be0e16fc
Merge pull request #29585 from Fox-McCloud/sound-performance
...
Improves several Sound Loops' Performance
2017-07-31 15:34:25 -04:00
Jordan Brown
20d8f32096
Merge pull request #29484
2017-07-31 09:52:59 -04:00
Cyberboss
f5f3758df3
Merge pull request #29288
2017-07-30 20:54:22 -04:00
Fox-McCloud
29f1779885
Improves several Sound Loops' Performance
2017-07-30 12:23:37 -04:00
XDTM
4865549b9f
Fixes a lot of eye damage procs ( #29565 )
2017-07-30 09:16:18 -04:00
Cyberboss
5b3b39cdd3
Merge pull request #29543
2017-07-29 20:41:11 -04:00
Cyberboss
8032eeab74
Merge pull request #29558
2017-07-29 20:41:00 -04:00
ShizCalev
d525b18d8d
Completes major inhand split project ( #29574 )
...
* Completes split project
* More work on it. Should be more or less finished
2017-07-29 16:47:37 -03:00
XDTM
97fc07898c
Merge branch 'master' into Hallucinations3.0
2017-07-29 12:43:18 +02:00
Joan Lung
13e0b4190c
Merge branch 'master' of https://github.com/tgstation/tgstation into geisrework
...
Conflicts:
code/game/gamemodes/clock_cult/clock_items/clockwork_slab.dm
2017-07-28 20:19:42 -04:00
Joan Lung
eda1a04b7f
Clockcult combat changes ( #29326 )
...
* Clockcult combat changes
* boom
* nah, less
* text changes
* compile
* more compile
2017-07-28 20:45:36 -03:00
Joan Lung
7209d00170
Sigils of Transmission can now drain power, but Interdiction Lenses have been removed ( #29221 )
...
* Sigils of Transmission can now drain power, but Interdiction Lenses have been removed
* bleh
* lensless
* mlem
2017-07-28 20:45:03 -03:00
octareenroon91
fb314c525b
Give c4 correct plastic_overlay
...
Fixes #19270
2017-07-28 15:46:49 -05:00
Jordan Brown
4a885018a6
Merge pull request #29533
2017-07-28 09:56:03 -04:00
pubby
8e8ca692a5
Updates PubbyStation
...
- makes layout more public
- adds monastery transit tube
- aux mining base is now in engineering maint.
- and more!
2017-07-27 20:35:49 -05:00
MoreRobustThanYou
899bb2a305
Ports Rapid Cable Layers from /vg/ and paradise ( #29119 )
...
Add's a tool that lays cable as you walk , speeding up cable construction
add: Nanotrasen has begun production of the Rapid Cable Layer, a tool that helps you lay down cables faster
add: You can now craft ghetto RCLs with metal, a screwdriver, welder, and wrench. They hold less cable, and may fall apart or jam!
2017-07-28 09:58:40 +12:00
Jordan Brown
12620b6bb3
Merge pull request #29518
2017-07-27 09:45:47 -04:00
Jordan Brown
f4e1be467c
Merge pull request #29502
2017-07-27 09:43:16 -04:00
Jordan Brown
f66bc2bebb
Merge pull request #29512
2017-07-27 09:43:06 -04:00
shizcalev
719612ba3b
ALLOW ME TO BREAK THE ICE
2017-07-26 20:44:42 -04:00
BeeSting12
ef251fc3a7
might be better to use total worth instead
2017-07-26 14:37:48 -04:00
BeeSting12
0fb80e97b3
fixes a couple issues
2017-07-26 14:38:44 -04:00
shizcalev
8ebf6b6a43
cleaned up paper
2017-07-26 05:35:05 -04:00
shizcalev
065bda1cc2
things
2017-07-25 22:26:51 -04:00
Joan Lung
6d7e3f2281
Lava is no longer a plating subtype ( #29463 )
2017-07-25 22:16:02 -03:00
oranges
b44bb6ffad
Revert "Adds the hivebot invasion event ( #28514 )"
...
This reverts commit 78a2e5c4c3
2017-07-25 23:06:38 +00:00
Jordan Brown
26f16d2222
Merge pull request #29476
2017-07-25 16:19:41 -04:00
kevinz000
75d9f8e3fc
Update musician.dm
2017-07-25 04:44:56 -07:00
Joan Lung
60e6580495
things I thought I fixed
2017-07-24 17:46:06 -04:00
oranges
ab940008b8
Merge pull request #29454 from ShizCalev/nanotrasen
...
Standardized the corporate name
2017-07-25 09:34:20 +12:00
Joan Lung
5b48b94c6f
Reworks Clockcult's standard conversion method, removes Taunting Tirade
2017-07-24 17:16:08 -04:00
Ashe Higgs
a5e7d63cb2
Unborks supermatter theft ( #29432 )
2017-07-24 09:51:04 +02:00
kevinz000
9e4681fdd8
Update musician.dm
2017-07-24 00:25:07 -07:00
kevinz000
d9a057966d
Update musician.dm
2017-07-24 00:13:10 -07:00
kevinz000
abeda8d408
Update musician.dm
2017-07-23 23:03:53 -07:00
oranges
90689ebba1
Merge pull request #29163 from Tacolizard/jim_E_Rustle
...
Prevents the captain's sabre from rustling jimmies
2017-07-24 11:12:42 +12:00
oranges
63c5f67dd1
Merge pull request #29431 from Xhuis/sorry_about_that_ii_screwed_it_up
...
Nuke screwdrivers are no longer randomly colored
2017-07-24 10:35:43 +12:00
kevinz000
bb37810a4a
Instrument performance update ( #29395 )
...
Scans for hearers every 4 ticks instead of per note.
2017-07-24 10:20:13 +12:00
shizcalev
f31cbb3ac5
Nanotrasen
2017-07-23 04:08:57 -04:00
kevinz000
e99d100c35
Fixes shower runtimes ( #29389 )
...
* Update watercloset.dm
* Update watercloset.dm
* Update watercloset.dm
2017-07-22 20:48:38 +02:00
Xhuis
a5f4e6c124
Nuke screwdrivers are no longer randomly colored
2017-07-21 21:16:54 -04:00
kevinz000
9123f45eab
Fixes harmonicas acting like muzzles (and runtiming instead of properly muting you too.) ( #29393 )
2017-07-21 20:25:19 -03:00
Leo
e677813a93
Merge pull request #29401 from Xhuis/satchel_fix
...
Ore satchels no longer have infinite capacity
2017-07-21 20:20:41 -03:00
Joan Lung
01d9da3da4
Fixes a drone ping issue
2017-07-20 18:16:18 -04:00
Xhuis
a3178652d6
Ore satchels no longer have infinite capacity
2017-07-20 12:37:26 -04:00
kevinz000
c48bd7ca08
Adds investigate logs to portals ( #29334 )
...
* Update teleportation.dm
* Update admin_investigate.dm
* Update logging.dm
* Update teleportation.dm
* Update teleportation.dm
* Update teleportation.dm
* Update teleportation.dm
* Update teleportation.dm
* Update teleportation.dm
2017-07-20 08:57:46 -04:00
Ashe Higgs
2438bd2aa8
Small belt overlay rewrite, and tool overlays for toolbelts ( #29180 )
...
* Belt overlay tweaks, tool overlays
* Belt overlays now have their own file
* work on porting to the new screwy looks
* Work on screwdrivers
* Fixes screwdrivers
* really SCREWED that one up!
2017-07-19 15:29:35 +01:00
XDTM
1c716c2f0f
Merge branch 'master' into Hallucinations3.0
2017-07-18 22:04:13 +02:00
Jordan Brown
9f2684af41
Merge pull request #29320 from Xhuis/electric_guitar_fix
...
Electric guitars now properly use .ogg sound files
2017-07-18 14:50:25 -04:00
ShizCalev
45d3d52af7
Made some object lists less terrible to read ( #29304 )
...
* spaces
* more spaces
* last ones
2017-07-18 10:44:29 -04:00
