Commit Graph

4852 Commits

Author SHA1 Message Date
awdaw 43382aebf1 Updates tiles, defines map in code\datums\ruins\space.dm 2020-08-21 00:39:19 +02:00
SteelSlayer a9d94b7cbf AoE spell logging tweaks 2020-08-17 10:24:30 -05:00
TDSSS eb0e2fffed Initial commit, looks kind of ugly and texts are whatever 2020-08-17 16:31:12 +02:00
AffectedArc07 c9f17cab6c Makes it so 1 butterfly still exists 2020-08-17 11:20:46 +01:00
AffectedArc07 2b48fa853d Revert "Deletes butterfly crate"
This reverts commit 1506653349.
2020-08-17 11:19:42 +01:00
AffectedArc07 b749fe5687 Merge pull request #13247 from farie82/logging-improvements-V2
Makes logging based on ckeys. Adds dchat/LOOC/OOC logging
2020-08-16 13:18:24 +01:00
TDSSS 222def424c Nt undercover changes 2020-08-16 13:39:38 +02:00
AffectedArc07 1506653349 Deletes butterfly crate 2020-08-15 22:42:39 +01:00
SteelSlayer 609d252fa8 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-08-15 13:13:50 -05:00
TDSSS 549e384574 WIP 2020-08-14 21:56:43 +02:00
Kyep f492d4d8cd fixes description 2020-08-11 21:51:13 -07:00
AffectedArc07 09ef06a7ec Merge pull request #13896 from Kyep/sleeper_teleport_fix
Fixes issues with machines/mechs when a person is teleported out of them
2020-08-11 14:29:41 +01:00
AffectedArc07 2e695ecf84 Merge pull request #13991 from Bizzonium/runtimeWires
Fix runtime in wires.dm when holder is null
2020-08-10 13:57:06 +01:00
joep van der velden 1de92a3d06 length instead of ?.len 2020-08-08 17:35:51 +02:00
joep van der velden c430b6e1e6 Merge remote-tracking branch 'upstream/master' into logging-improvements-V2 2020-08-08 17:30:09 +02:00
AffectedArc07 fcd6f900b9 Merge pull request #13175 from farie82/logging-improvements
Logging view improvements
2020-08-08 16:23:06 +01:00
SteelSlayer d928635393 Some spawn removals and other assorted code cleanup 2020-08-07 08:55:34 -05:00
Kyep 598388b38c Fixes a cause of "Runtime in ,:" (#13976)
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-08-02 23:22:56 -06:00
Bizzonium 18606c4200 Code improvements 2020-08-03 00:20:14 +03:00
Bizzonium 00558f129b Fix runtime in wires.dm when holder is null 2020-08-02 21:51:40 +03:00
Kyep 370ee8b991 Fixes #13132 2020-08-01 10:34:06 -07:00
Kyep 8f56610e1e updates explanation in comments 2020-07-28 20:39:59 -07:00
Kyep 2c0ebf2728 converts aicontroldisabled into a define, also mochi suggestions 2020-07-27 01:24:59 -07:00
AffectedArc07 35cdc641b2 Unit Test For Invalid Map Templates 2020-07-25 18:09:57 +01:00
Kyep a0e07dd41a SM & TEG cargo crate appearance 2020-07-23 02:43:20 -07:00
mochi 7e3fb680c0 Headphones, fix unreachable dropoff threshold, etc. 2020-07-22 17:50:30 +02:00
mochi 79ed9b8b57 Merge branch 'master' into instrument-tgui-n-optimization 2020-07-21 23:55:11 +02:00
farie82 cdc762975c Makes for loops use GLOB.human_list. Should improve performance a bit. Fixes blood contract affecting dead crew (#13691)
* Replaces all human in X to GLOB.human_list

* crew monitor

* no playerlist converts

* forgot to stage there...
2020-07-21 16:43:24 -04:00
Fox McCloud 4d2e388ddb Merge pull request #13860 from warior4356/boxing
Adds boxing glove crate
2020-07-21 15:53:10 -04:00
farie82 9111a64af9 Meat hook fix. Beam runtime fix (#13867) 2020-07-21 03:33:23 -06:00
mochi dd5c88eb74 Address comments 2020-07-20 06:59:40 +02:00
SteelSlayer 47da705e90 borg wire bugfixes 2020-07-19 23:26:47 -05:00
SteelSlayer 2045759348 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-07-19 23:20:20 -05:00
mochi 24e8cd66ac Port Baystruments PR from tgstation 2020-07-17 15:18:17 +02:00
warior4356 b722f8186d Update supplypacks.dm 2020-07-16 23:55:03 -07:00
warior4356 fe9b5695c9 Adds boxing glove crate 2020-07-16 23:45:10 -07:00
AffectedArc07 b3102cd514 Makes it so only one theta station can spawn 2020-07-16 09:49:00 +01:00
SteelSlayer d75d29191a mind cleanup 2020-07-13 22:18:04 -05:00
Fox McCloud b88bb469d8 Merge pull request #13799 from farie82/robot-sync-fix
Makes borgs (dis)connect properly to the AI. Fixing invisible borgs for the AI and a runtime or more
2020-07-13 16:30:07 -04:00
Fox McCloud 66cc24f558 Merge pull request #13645 from dearmochi/dmm-suite-refactor
Refactor dmm_suite for readability
2020-07-13 15:37:23 -04:00
Fox McCloud de0c606969 Merge pull request #13502 from AffectedArc07/hook-kill-v10-final-ultimate-final
HOOKS ARE DEAD
2020-07-13 13:55:04 -04:00
mochi d0be92103f Merge branch 'master' into client-hud-consistency 2020-07-13 10:31:00 +02:00
AffectedArc07 390e41e91d The elephant: Ruin + Whiteship rework (#13632)
* The elephant: Ruin + Whiteship rework

* ROUND TWO: FIGHT

* Forgot this

* Kyet Fixes

* [NEEDS TESTING] Tweaks from new knowledge

* Adds to Meta, Removes from Delta

* This isnt needed anymore

* Adds in one empty space level

* Area tweaks
2020-07-12 13:44:58 -06:00
AffectedArc07 014dbd95d9 Merge branch 'master' into hook-kill-v10-final-ultimate-final 2020-07-12 09:27:33 +01:00
Fox McCloud f71e66f428 Merge pull request #13760 from denghis1/bugfix_syndicate_bomb_defusal
bugfix syndicate bomb not triggering defuse properly
2020-07-11 22:26:45 -04:00
Fox McCloud e8deb47865 Merge pull request #13789 from AffectedArc07/proc-call-safety
Adds proc call security
2020-07-11 22:25:02 -04:00
AffectedArc07 650c638d41 Removes semicolons 2020-07-11 18:51:45 +01:00
Fox McCloud 85abb6505b Merge remote-tracking branch 'upstream/master' into alarm-overhaul 2020-07-10 15:05:37 -04:00
joep van der velden 55b7c6ece0 Makes sure borgs actually sync and unsync correctly to the AI 2020-07-10 15:19:47 +02:00
Fox McCloud dfef1a5053 Merge pull request #13767 from AffectedArc07/ui-assets-verb
Allows clients to reload their UI assets
2020-07-10 03:59:43 -04:00