6b22f606cd
it's not modularrrrrrrr
2017-07-29 12:36:41 -04:00
bb39d3f8ea
Removes a rogue period from the sliver theft obj.
2017-07-29 11:49:53 -04:00
97fc07898c
Merge branch 'master' into Hallucinations3.0
2017-07-29 12:43:18 +02:00
59fdce8e66
Lotsa stuff
2017-07-29 12:36:48 +02:00
2efdc78681
this fixes the PR
2017-07-29 03:52:55 +02:00
7ecbb8a1b2
Merge branch 'master' into disgustport
2017-07-29 03:06:25 +02:00
585af21f6f
no message
2017-07-28 20:32:29 -04:00
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
c8d08b66b5
cleaned up vareditted turfs ( #29551 )
2017-07-28 20:47:14 -03:00
eda1a04b7f
Clockcult combat changes ( #29326 )
...
* Clockcult combat changes
* boom
* nah, less
* text changes
* compile
* more compile
2017-07-28 20:45:36 -03:00
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
1516a56970
Prolonging Prisms have a higher cost to delay, but no longer increase in cost based off of CV ( #29325 )
2017-07-28 20:44:09 -03:00
d951b65eba
Admin "Reload Station" Map Generator - Reloads specified block to roundstart. ( #28986 )
...
Badmins: Buildmode map generators have names in the list to select them, instead of paths.
Also, a new map generator has been added, repair/reload station. Use it VERY sparingly, it deletes the block of the map and reloads it to roundstart. THIS CAN CAUSE ISSUES WITH MACHINES AND ATMOSPHERICS, SO DO NOT USE IT UNLESS YOU ABSOLUTELY HAVE TO!
The reload station one tagged DO NOT USE shouldn't be used as it doesn't delete anything before loading, so if you use it you'll have two copies of things. That can result in a LOT of issues, so don't use it unless you're a codermin and know what you're doing/abusing!
2017-07-29 11:43:43 +12:00
3f2b689790
Update traitor.dm
2017-07-28 16:37:29 -07:00
3ffab6aa2d
Adds emergency toolbox to escape pod supplies
...
Closes #19247
2017-07-28 16:00:01 -05:00
fb314c525b
Give c4 correct plastic_overlay
...
Fixes #19270
2017-07-28 15:46:49 -05:00
2d1fd03b72
review
2017-07-28 12:17:02 -04:00
381082066d
Fixes syringe injection not working
2017-07-28 11:16:06 -04:00
25c35c2829
Merge pull request #29455
2017-07-28 09:57:07 -04:00
fad1da7823
Merge pull request #29466
2017-07-28 09:56:36 -04:00
4a885018a6
Merge pull request #29533
2017-07-28 09:56:03 -04:00
d302114639
Merge pull request #29536
2017-07-28 09:55:27 -04:00
3c44a27161
Merge pull request #29540
2017-07-28 09:54:56 -04:00
ec18102501
For clairity
2017-07-28 09:39:16 -04:00
ec9219c1ec
FALSE and NONE
2017-07-28 09:35:31 -04:00
98d4bc6eee
Merge pull request #29529 from ChangelingRain/bowremoval
...
Removes bows
2017-07-28 00:11:50 -03:00
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
2b81912dec
Fixes scythes cutting kudzu
2017-07-27 20:41:13 -04:00
150d6c48c9
Adds a notice for medbots on failed heals
2017-07-27 20:07:20 -04:00
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
71c7e1fdee
last tweaks
2017-07-27 17:45:08 -04:00
778346094c
Fixes mutation toxins not stunning properly
2017-07-27 20:17:02 +02:00
540fd80dc7
Fixes icon_state of scarecrow mask
2017-07-27 13:18:05 -04:00
bda0a5fe80
Changes mummy bandages and scarecrow sack to masks
2017-07-27 13:15:38 -04:00
12620b6bb3
Merge pull request #29518
2017-07-27 09:45:47 -04:00
f4e1be467c
Merge pull request #29502
2017-07-27 09:43:16 -04:00
a4fa45e7a3
Merge pull request #29511
2017-07-27 09:43:11 -04:00
f66bc2bebb
Merge pull request #29512
2017-07-27 09:43:06 -04:00
0ffbbbb708
Merge pull request #29515
2017-07-27 09:43:02 -04:00
84b4690c16
Update tools.dm
2017-07-27 14:35:24 +01:00
0fe067676a
Update augments_arms.dm
2017-07-27 14:34:36 +01:00
122f5b58eb
Ashstorms Matryoshka bugfix
...
Ashstorms will now allow someone IN someone protected also protect them.
This is the bug that used to kill borers inside a host who was
protected, but it applies to anything really.
2017-07-27 11:11:04 +02:00
e7047572f6
Update SDQL_2.dm
2017-07-26 22:30:23 -07:00
00770a93ec
Merge pull request #29505 from ShizCalev/beach-away-mission-fix
...
Cleaned up some turf decals, fixed beach away mission
2017-07-27 01:22:20 -03:00
42bbf1d254
Merge pull request #29503 from Anonmare/patch-5
...
Makes chemical payload bomb cores less misleading
2017-07-27 01:19:17 -03:00
d83933c3b2
Merge pull request #29509 from ShizCalev/delta-aux-base
...
Added miner closet to delta aux base storage
2017-07-27 01:14:45 -03:00
b4aa283c57
replicated clockwork sprite fixes
...
closes #29531
2017-07-26 22:59:44 -04:00
719612ba3b
ALLOW ME TO BREAK THE ICE
2017-07-26 20:44:42 -04:00
36d70f3114
Removes bows
2017-07-26 18:39:57 -04:00
08ba8306da
Merge pull request #29495
2017-07-26 16:43:10 -04:00
Xhuis
XDTM
Unknown
Joan Lung
ShizCalev
kevinz000
octareenroon91
Jordan Brown
Leo
pubby
MoreRobustThanYou
Fox-McCloud
XDTM
KorPhaeron
Anonmare
ktccd
shizcalev