866f928ec2
Fixes a cliffhanger comment.
2017-07-30 09:11:32 -05:00
5ebc26b053
Update labor camp stacker accepted sheets.
2017-07-30 09:03:11 -05:00
4865549b9f
Fixes a lot of eye damage procs ( #29565 )
2017-07-30 09:16:18 -04:00
0d2f62499f
Update helpers.dm
2017-07-29 22:29:25 -07:00
a90467d83c
Update helpers.dm
2017-07-29 22:00:19 -07:00
5116dd964a
Merge pull request #29547
2017-07-29 20:41:08 -04:00
84b1115d12
Merge pull request #29549
2017-07-29 20:41:05 -04:00
1acd7fe210
Merge pull request #29555
2017-07-29 20:41:03 -04:00
2c46a8dcad
Merge pull request #29559
2017-07-29 20:40:57 -04:00
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
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
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
3ffab6aa2d
Adds emergency toolbox to escape pod supplies
...
Closes #19247
2017-07-28 16:00:01 -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
3c44a27161
Merge pull request #29540
2017-07-28 09:54:56 -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
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
f4e1be467c
Merge pull request #29502
2017-07-27 09:43:16 -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
e7047572f6
Update SDQL_2.dm
2017-07-26 22:30:23 -07: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
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
55719b3ea3
Merge pull request #29493
2017-07-26 16:43:07 -04:00
58fdff5b97
Merge pull request #29488
2017-07-26 16:43:02 -04:00
0b6376f449
Merge pull request #29487
2017-07-26 16:42:59 -04:00
27c1c0347d
Last ones.
...
Missed a couple. Also cleaned up a couple leftover semicolons
2017-07-26 12:47:38 -04:00
863ff3f826
Corrected comment.
2017-07-26 12:27:38 -04:00
12c279e537
less vague paths, inconsistency with derelict path
2017-07-26 12:25:39 -04:00
cbfdc9ca3c
cease cleverness
2017-07-26 11:43:28 -04:00
8dd52c80d2
Update SDQL_2.dm
2017-07-26 06:53:47 -07:00
d0d351f0b0
SDQL_runtimes
2017-07-26 05:57:16 -07:00
pubby
XDTM
kevinz000
Cyberboss
ShizCalev
Unknown
octareenroon91
Joan Lung
Xhuis
Leo
MoreRobustThanYou
Fox-McCloud
XDTM
KorPhaeron
Anonmare
shizcalev