fb24abfaf7
Merge pull request #3652 from Citadel-Station-13/upstream-merge-32142
...
[MIRROR] Remove stray parent proc call in collector code
2017-10-29 03:46:30 -04:00
13891ec34b
Merge pull request #3651 from Citadel-Station-13/upstream-merge-32107
...
[MIRROR] Adds some new grindables to the grinder
2017-10-29 03:46:19 -04:00
7402fab19e
Merge pull request #3650 from Citadel-Station-13/upstream-merge-32137
...
[MIRROR] Remove some unneeded null checks in lighting
2017-10-29 03:46:05 -04:00
4b300cee6c
Merge branch 'master' into upstream-merge-32116
2017-10-29 03:45:59 -04:00
6156067cd6
Merge pull request #3645 from Citadel-Station-13/upstream-merge-32022
...
[MIRROR] Find references fix.
2017-10-29 03:45:15 -04:00
5f9a76c6dd
Merge pull request #3644 from Citadel-Station-13/upstream-merge-32009
...
[MIRROR] Add a safety check to buildmode, also fix a bug with corner selection
2017-10-29 03:45:06 -04:00
d6c143c860
Merge pull request #3643 from Citadel-Station-13/upstream-merge-32121
...
[MIRROR] Fixes motion cameras runtiming when a target is deleted before they are detected to be leaving the range/dead.
2017-10-29 03:44:55 -04:00
c62f6ec353
Merge pull request #3632 from Citadel-Station-13/upstream-merge-32093
...
[MIRROR] Roundstart species pref fixes/removes redundant species config
2017-10-29 03:41:59 -04:00
a595bee5af
Update preferences.dm
2017-10-29 01:58:33 -05:00
95023664dd
Update preferences.dm
2017-10-29 01:53:35 -05:00
74a33169cb
Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051
...
[MIRROR] More radiation balance changes and fixes
2017-10-29 02:41:44 -04:00
f77b66ebb9
Update preferences.dm
2017-10-29 01:40:28 -05:00
bea9365ea9
Merge branch 'master' into upstream-merge-32093
2017-10-29 02:27:52 -04:00
d24e4f2d84
Update game_options.dm
2017-10-29 00:59:20 -05:00
3b91f4efcc
Merge branch 'master' into upstream-merge-32096
2017-10-29 01:49:22 -04:00
71dd5e8e2e
Update game_options.dm
2017-10-29 00:48:50 -05:00
debaad2948
Update podpeople.dm
2017-10-29 00:47:47 -05:00
d4e794eef7
Update furrypeople.dm
2017-10-29 00:47:25 -05:00
180e730be9
Update species.dm
2017-10-29 00:46:15 -05:00
78da30ec8d
Update species.dm
2017-10-29 00:25:17 -05:00
e150fe28b6
Merge branch 'master' into upstream-merge-31877
2017-10-28 23:57:51 -04:00
d5856ad609
Allows RPD to place pipes on catwalks/girders ( #32141 )
...
* Allows RPD to place pipes on catwalks
* allows girders too
* fixes parenthesis
i sniff glue
2017-10-28 12:00:23 -05:00
1265e804c5
[MIRROR] Adds a method to transfer all components from one datum to another ( #3661 )
...
* Merge pull request #31941 from tgstation/Cyberboss-patch-2
Adds a method to transfer all components from one datum to another
* Adds a method to transfer all components from one datum to another
2017-10-28 01:19:48 -07:00
4e4634649e
[MIRROR] [Review Again] Updates the cloning manual ( #3663 )
...
* [Review Again] Updates the cloning manual
* Update manuals.dm
2017-10-28 01:19:38 -07:00
c64446962d
Merge branch 'master' into upstream-merge-32096
2017-10-28 03:47:08 -04:00
a221d3505f
Update DNA.dm
2017-10-28 02:19:08 -05:00
6172cd38bd
Merge pull request #3628 from Citadel-Station-13/upstream-merge-32087
...
[MIRROR] Halloween Tweaks
2017-10-28 03:16:43 -04:00
30514ff9c2
Revert "Revert "schrondinger's paranoia fix, also check_contents_for doesnt support lists""
...
This reverts commit 663d01702d
2017-10-28 02:20:43 -04:00
663d01702d
Revert "schrondinger's paranoia fix, also check_contents_for doesnt support lists"
...
This reverts commit b83be3feae
2017-10-28 02:20:29 -04:00
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
79d6f42dfd
conflicts
2017-10-28 01:16:26 -05:00
b83be3feae
schrondinger's paranoia fix, also check_contents_for doesnt support lists
2017-10-28 02:12:53 -04:00
5dbcbf5689
Update podpeople.dm
2017-10-28 00:23:30 -05:00
2d8468aed0
Update _cit_helpers.dm
2017-10-28 00:23:25 -05:00
985fdcd22d
Update clown_items.dm
2017-10-27 23:56:37 -05:00
08153b0fbb
Update misc.dm
2017-10-27 23:56:13 -05:00
7ffe1b4e23
Update cmp.dm
2017-10-27 23:55:23 -05:00
12fa1e3ece
Update preferences_savefile.dm
2017-10-27 23:54:51 -05:00
9daacd69c5
Update game_options.dm
2017-10-27 23:54:35 -05:00
730c13f980
Merge pull request #32091 from tgstation/Cyberboss-patch-1
...
Revheads now always recieve a HUD when created
2017-10-27 17:44:06 -05:00
82c388b3e8
Makes thermite a component
2017-10-27 17:36:38 -05:00
37bb75a645
Restricts some more areas from servant warp, and lets admins start the Ark on non-clockcult rounds ( #31723 )
...
* Cleans up clockcult code a little
* Another thing with servants_active
* Now it compiles
2017-10-27 17:36:31 -05:00
c00c1dcc00
Merge pull request #32127 from tgstation/Cyberboss-patch-3
...
[s] Blocks world proc calls
2017-10-27 17:35:20 -05:00
f4d0108beb
build_appearance_list no longer edits the list it is passed ( #32066 )
...
* build_appearance_list no longer edits the list it is passed
* Mistakes were made
* Update overlays.dm
2017-10-27 17:35:13 -05:00
27492e891f
Map config cleanup ( #32132 )
...
* Map config cleanup
* Fix
2017-10-27 17:35:05 -05:00
fde6a94202
Merge pull request #32112 from KorPhaeron/mummies
...
"Mummies" (cloth golems) for Halloween
2017-10-27 17:33:52 -05:00
f6a00d4a38
Merge pull request #32130 from Cyberboss/call_security
...
[s] Makes ImmediateInvokeAsync a world proc
2017-10-27 17:33:42 -05:00
ce4ccedd10
Merge pull request #32119 from AnturK/convertfix
...
Fixes round conversion issues
2017-10-27 17:32:30 -05:00
1d8184e206
Merge pull request #32142 from optimumtact/boiwhatarethose
...
Remove stray parent proc call in collector code
2017-10-27 17:31:19 -05:00
79e69cbd36
Adds some new grindables to the grinder ( #32107 )
...
* Adds some new grindables to the grinder
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Update reagentgrinder.dm
* Adds the extra ")"
* Update reagentgrinder.dm
2017-10-27 17:30:08 -05:00
LetterJay