Commit Graph

5535 Commits

Author SHA1 Message Date
LetterJay
4b300cee6c Merge branch 'master' into upstream-merge-32116 2017-10-29 03:45:59 -04:00
LetterJay
6156067cd6 Merge pull request #3645 from Citadel-Station-13/upstream-merge-32022
[MIRROR] Find references fix.
2017-10-29 03:45:15 -04:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
a595bee5af Update preferences.dm 2017-10-29 01:58:33 -05:00
LetterJay
95023664dd Update preferences.dm 2017-10-29 01:53:35 -05:00
LetterJay
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
LetterJay
f77b66ebb9 Update preferences.dm 2017-10-29 01:40:28 -05:00
LetterJay
bea9365ea9 Merge branch 'master' into upstream-merge-32093 2017-10-29 02:27:52 -04:00
LetterJay
d24e4f2d84 Update game_options.dm 2017-10-29 00:59:20 -05:00
LetterJay
3b91f4efcc Merge branch 'master' into upstream-merge-32096 2017-10-29 01:49:22 -04:00
LetterJay
71dd5e8e2e Update game_options.dm 2017-10-29 00:48:50 -05:00
LetterJay
debaad2948 Update podpeople.dm 2017-10-29 00:47:47 -05:00
LetterJay
d4e794eef7 Update furrypeople.dm 2017-10-29 00:47:25 -05:00
LetterJay
180e730be9 Update species.dm 2017-10-29 00:46:15 -05:00
LetterJay
78da30ec8d Update species.dm 2017-10-29 00:25:17 -05:00
LetterJay
e150fe28b6 Merge branch 'master' into upstream-merge-31877 2017-10-28 23:57:51 -04:00
CitadelStationBot
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
CitadelStationBot
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
LetterJay
c64446962d Merge branch 'master' into upstream-merge-32096 2017-10-28 03:47:08 -04:00
LetterJay
a221d3505f Update DNA.dm 2017-10-28 02:19:08 -05:00
LetterJay
6172cd38bd Merge pull request #3628 from Citadel-Station-13/upstream-merge-32087
[MIRROR] Halloween Tweaks
2017-10-28 03:16:43 -04:00
LetterJay
0e553b26db Merge branch 'master' into upstream-merge-31737 2017-10-28 02:20:25 -04:00
LetterJay
79d6f42dfd conflicts 2017-10-28 01:16:26 -05:00
LetterJay
5dbcbf5689 Update podpeople.dm 2017-10-28 00:23:30 -05:00
LetterJay
2d8468aed0 Update _cit_helpers.dm 2017-10-28 00:23:25 -05:00
LetterJay
7ffe1b4e23 Update cmp.dm 2017-10-27 23:55:23 -05:00
LetterJay
12fa1e3ece Update preferences_savefile.dm 2017-10-27 23:54:51 -05:00
LetterJay
9daacd69c5 Update game_options.dm 2017-10-27 23:54:35 -05:00
LetterJay
fb5863ba35 Merge pull request #3630 from deathride58/adminhelphandlebutton
Adds a "Handle Issue" button to ahelps
2017-10-27 16:33:21 -04:00
LetterJay
39f683ab8d Update meteor_wave.dm 2017-10-27 15:32:38 -05:00
LetterJay
12d336cbf0 Update halloween.dm 2017-10-27 15:32:15 -05:00
Jordan Brown
f36d3ff08a Line by line profiling system 2017-10-27 13:10:21 -05:00
LetterJay
a5338759b7 donation item 2017-10-27 13:06:53 -05:00
Kyle Spier-Swenson
8469b4223e Find references fix. (#32022)
* Find references fix.

Made it go from taking years to hours

Removed Datum based recursion, this was unneeded.

Fixed it calling a proc for what ended up being a costly noop millions of times (this was a moderate speed up as it would call DoSearchVar on every fucking number or string or null in a things vars list.)

Fixed it calling itself on the vars list. luckily it only checked keys, so this didn't stack overflow.

I'm intentionally leaving the debugging stuff in right now so that its on the record somewhere. I'll remove that when I pr line by line profiling as its own separate thing

* Remove debugging stuff

* i forgot
2017-10-27 04:57:15 -05:00
JamieH
7811507f1a Add a safety check to buildmode, also fix a bug with corner selection (#32009)
* Update buildmode.dm

* Add files via upload

* Update buildmode.dm

* Update buildmode.dm
2017-10-27 04:51:58 -05:00
kevinz000
1110cca542 Fixes motion runtimes from deleted targets (#32121) 2017-10-27 04:47:45 -05:00
Emmett Gaines
ea36d5944e More radiation balance changes and fixes (#32051)
* more balance changes and fixes

* cleanup
2017-10-27 03:08:03 -05:00
LetterJay
9599dd94c0 Merge pull request #3634 from deathride58/voreproctovoreverb
Readds the hook necessary for vore setup
2017-10-27 03:15:22 -04:00
LetterJay
af96c29a0c Merge pull request #3635 from ktccd/Undo_Borer_HUDS
Undoes Borer HUDs
2017-10-27 02:49:03 -04:00
LetterJay
3719319bf3 Merge pull request #3638 from deathride58/dontcodewhiledrunk
Fixes miscreant generation
2017-10-27 02:48:26 -04:00
LetterJay
7f6b1a6400 Merge pull request #3637 from deathride58/loocerrorfix
Fixes LOOC error messages not appearing in goonchat
2017-10-27 02:48:16 -04:00
LetterJay
141de52658 Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791
[MIRROR] Assmos part 1, #2
2017-10-27 02:47:56 -04:00
LetterJay
4ab8e0d8f1 Merge pull request #3625 from Citadel-Station-13/upstream-merge-31987
[MIRROR] Inlines and optimizes compile_overlays
2017-10-27 02:44:48 -04:00
LetterJay
31ee6947ee Merge pull request #3624 from Citadel-Station-13/upstream-merge-32039
[MIRROR] Rebalances clockwork marauders
2017-10-27 02:44:17 -04:00
LetterJay
3ad1ac335f Merge pull request #3623 from Citadel-Station-13/upstream-merge-31991
[MIRROR] fixes reflectors dropping extra mats
2017-10-27 02:43:35 -04:00
LetterJay
ab12387ebd Merge pull request #3622 from Citadel-Station-13/upstream-merge-32029
[MIRROR] Actual performance improvements for GetAllContents
2017-10-27 02:43:16 -04:00
LetterJay
a7b464e47e Merge pull request #3620 from Citadel-Station-13/upstream-merge-32030
[MIRROR] Allows components to qdel from Initialize
2017-10-27 02:19:07 -04:00
LetterJay
9a1db237d2 Merge pull request #3618 from Citadel-Station-13/upstream-merge-32058
[MIRROR] Fixes lightgeist spawning
2017-10-27 02:18:48 -04:00