Commit Graph

10013 Commits

Author SHA1 Message Date
Cyberboss a2dc6e2c5a Merge pull request #29724 2017-08-06 18:58:26 -04:00
Firecage f65786a8cf The inhands of the Dark Blessing chaplain weapon is now visible. (#29727) 2017-08-05 11:02:21 -03:00
AnturK d1bb1686cb Fixes showers breaking lighting objects. (#29706) 2017-08-05 09:43:00 -03:00
FrozenGuy5 e28634eb91 initaliazieizlie 2017-08-05 01:57:54 +01:00
FrozenGuy5 552b851445 Update light.dm 2017-08-05 01:45:27 +01:00
Cyberboss 7e6c1198e9 Merge pull request #29695 2017-08-04 10:21:47 -04:00
Cyberboss fc0a102753 Merge pull request #29693 2017-08-04 10:21:07 -04:00
oranges 6b6fc91172 Merge pull request #29623 from Cyberboss/TiredOfBS
Removes all checks for subsystem existence
2017-08-04 23:54:47 +12:00
FrozenGuy5 76ee209a6c flora initialize poo 2017-08-03 22:16:49 +03:00
Lzimann 97199dd8b0 Gives an initialize hint to stacks, boxes, closets and bots 2017-08-03 15:30:00 -03:00
ShizCalev 1ca932278f Tweaked SM overlay (#29645) 2017-08-03 10:42:38 -04:00
ShizCalev b3a2721590 Window Spawners (#29634) 2017-08-02 10:11:07 -04:00
Jordan Brown 6806607425 Merge pull request #29369 2017-08-02 09:45:05 -04:00
Jordan Brown d3a4468ede Fixes devil pitchforks being uninitialized (#29610) 2017-08-01 17:57:15 -05:00
Jordan Brown 6175ab77d5 Removes all checks for subsystem existence 2017-08-01 10:16:37 -04:00
Jordan Brown 6df66f730f Merge pull request #29617 2017-08-01 09:40:33 -04:00
Jordan Brown 3ec4aec215 Merge pull request #29601 2017-08-01 09:37:28 -04:00
shizcalev 99624b8e74 further spellchecking 2017-07-31 23:09:08 -04:00
MoreRobustThanYou d4966faf23 removes ERP material 2017-07-31 21:48:50 -04:00
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
Unknown 2efdc78681 this fixes the PR 2017-07-29 03:52:55 +02:00
Qustinnus 7ecbb8a1b2 Merge branch 'master' into disgustport 2017-07-29 03:06:25 +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