Unknown
d5a783a7dc
adds cooldown of 5 seconds
2017-07-31 20:05:17 +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
kevinz000
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
Jordan Brown
25c35c2829
Merge pull request #29455
2017-07-28 09:57:07 -04:00
Jordan Brown
fad1da7823
Merge pull request #29466
2017-07-28 09:56:36 -04:00
Jordan Brown
4a885018a6
Merge pull request #29533
2017-07-28 09:56:03 -04:00
Jordan Brown
3c44a27161
Merge pull request #29540
2017-07-28 09:54:56 -04:00
Jordan Brown
ec9219c1ec
FALSE and NONE
2017-07-28 09:35:31 -04:00
Leo
98d4bc6eee
Merge pull request #29529 from ChangelingRain/bowremoval
...
Removes bows
2017-07-28 00:11:50 -03: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
Fox-McCloud
71c7e1fdee
last tweaks
2017-07-27 17:45:08 -04:00
XDTM
778346094c
Fixes mutation toxins not stunning properly
2017-07-27 20:17:02 +02:00
KorPhaeron
540fd80dc7
Fixes icon_state of scarecrow mask
2017-07-27 13:18:05 -04:00
KorPhaeron
bda0a5fe80
Changes mummy bandages and scarecrow sack to masks
2017-07-27 13:15:38 -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
Jordan Brown
0ffbbbb708
Merge pull request #29515
2017-07-27 09:43:02 -04:00
kevinz000
e7047572f6
Update SDQL_2.dm
2017-07-26 22:30:23 -07:00
Leo
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
shizcalev
719612ba3b
ALLOW ME TO BREAK THE ICE
2017-07-26 20:44:42 -04:00
Joan Lung
36d70f3114
Removes bows
2017-07-26 18:39:57 -04:00
Jordan Brown
08ba8306da
Merge pull request #29495
2017-07-26 16:43:10 -04:00
Jordan Brown
55719b3ea3
Merge pull request #29493
2017-07-26 16:43:07 -04:00
Jordan Brown
58fdff5b97
Merge pull request #29488
2017-07-26 16:43:02 -04:00
Jordan Brown
0b6376f449
Merge pull request #29487
2017-07-26 16:42:59 -04:00
shizcalev
27c1c0347d
Last ones.
...
Missed a couple. Also cleaned up a couple leftover semicolons
2017-07-26 12:47:38 -04:00
shizcalev
863ff3f826
Corrected comment.
2017-07-26 12:27:38 -04:00
shizcalev
12c279e537
less vague paths, inconsistency with derelict path
2017-07-26 12:25:39 -04:00
Joan Lung
cbfdc9ca3c
cease cleverness
2017-07-26 11:43:28 -04:00
kevinz000
8dd52c80d2
Update SDQL_2.dm
2017-07-26 06:53:47 -07:00
kevinz000
d0d351f0b0
SDQL_runtimes
2017-07-26 05:57:16 -07:00
shizcalev
ab183d2e1d
fixed compile
2017-07-26 05:48:07 -04:00
shizcalev
8ebf6b6a43
cleaned up paper
2017-07-26 05:35:05 -04:00
BeeSting12
f4329f4ebe
i really hope this will fix it
2017-07-26 00:40:14 -04:00
shizcalev
0559af385f
mining closets
2017-07-25 23:28:10 -04:00
Joan Lung
6d7e3f2281
Lava is no longer a plating subtype ( #29463 )
2017-07-25 22:16:02 -03:00
Tacolizard
7a64ded7a2
Adds cybernetic organs ( #29276 )
...
add: Added cybernetic organs to RnD, they can be used to replace organic organs. Remember to administer corazone during implantation though!
add: Added the upgraded cybernetic liver. It is exceptionally robust against toxins and alcohol poisoning.
2017-07-26 11:29:28 +12:00
oranges
b44bb6ffad
Revert "Adds the hivebot invasion event ( #28514 )"
...
This reverts commit 78a2e5c4c3
2017-07-25 23:06:38 +00:00
Joan Lung
6bcf83ca5b
Portals do not go on supply shuttles
2017-07-25 16:28:25 -04:00
Jordan Brown
644f436df8
Merge pull request #29460
2017-07-25 16:21:39 -04:00
Jordan Brown
3d408a54ec
Merge pull request #29450
2017-07-25 16:21:03 -04:00
BeeSting12
f5f8f7f369
gives service borgs one too
2017-07-25 13:11:11 -04:00
Xhuis
35c396be90
Fixes some zooming weirdness
2017-07-25 11:27:13 -04:00
KorPhaeron
69690c1826
Small
2017-07-24 22:17:09 -04:00
ShizCalev
0e9b3967e2
Spellchecks the map definitions ( #29485 )
2017-07-25 14:16:06 +12:00
KorPhaeron
6305192b63
Makes narsie less huge
2017-07-24 22:01:28 -04:00
BeeSting12
a97d4e87f8
vwejiwcqcwvwfbv
2017-07-24 19:11:49 -04:00
Ashe Higgs
08569ecadb
You can now control-click action buttons to lock them in place ( #29379 )
...
Adds a lock function to action buttons, as well as a preference controlling default behaviour.
2017-07-25 10:05:18 +12:00
oranges
ab940008b8
Merge pull request #29454 from ShizCalev/nanotrasen
...
Standardized the corporate name
2017-07-25 09:34:20 +12:00
