Commit Graph
38137 Commits
Author SHA1 Message Date
Fox McCloud e05594f5b5 Ragin' Mages Spell Cast Fix 2018-07-01 16:45:44 -04:00
Crazy LemonandGitHub 3ca333d666 Merge pull request #9040 from Anasari/CryoLog
Cryo Logging PR
2018-07-01 00:47:39 -07:00
Anasari dc5d384380 Moar fix 2018-07-01 15:21:23 +08:00
ParadiseSS13-Bot 470c4b7f2f Automatic changelog compile, [ci skip] 2018-07-01 06:45:21 +00:00
ParadiseSS13-Bot 74ce22a18e Automatic changelog generation for PR #8999 [ci skip] 2018-07-01 01:11:06 -04:00
Crazy LemonandGitHub 3975a7d0f7 Merge pull request #8999 from Citinited/somebody-toucha-ma-spaghett
Adds macaroni cheese (pizza)
2018-06-30 22:11:05 -07:00
ParadiseSS13-Bot e72efe68fe Automatic changelog generation for PR #9149 [ci skip] 2018-07-01 01:08:30 -04:00
Crazy LemonandGitHub bdaa1813a2 Merge pull request #9149 from datlo/master
Clown Magboots
2018-06-30 22:08:29 -07:00
Crazy LemonandGitHub 907ba717ce Merge pull request #9145 from Kyep/specops_tables
Fixes specops tables
2018-06-30 22:05:02 -07:00
ParadiseSS13-Bot 3c0873992f Automatic changelog compile, [ci skip] 2018-07-01 04:54:16 +00:00
ParadiseSS13-Bot 58ccab1217 Automatic changelog generation for PR #9132 [ci skip] 2018-06-30 23:57:12 -04:00
Crazy LemonandGitHub cb35939a00 Merge pull request #9132 from monster860/readd_mining_podbay
Readds the mining podbay
2018-06-30 20:57:11 -07:00
Crazy LemonandGitHub 099f19b77e Merge pull request #9023 from Anasari/LabelerLogging
Add labeler to investigate logs
2018-06-30 20:33:35 -07:00
Crazy LemonandGitHub f1fc9375f5 Merge branch 'master' into LabelerLogging 2018-06-30 20:19:53 -07:00
ParadiseSS13-Bot cafd2ac767 Automatic changelog compile, [ci skip] 2018-06-30 05:29:26 +00:00
ParadiseSS13-Bot 05a2208e2b Automatic changelog generation for PR #9047 [ci skip] 2018-06-30 00:11:51 -04:00
Crazy LemonandGitHub 7d61c7f32d Merge pull request #9047 from Citinited/conveyor-belt-placer
Adds the conveyor belt placer
2018-06-29 21:11:49 -07:00
datlo 69779717fa Cut code duplication, added sprites
Added a new variable to magboots called slowdown_passive, letting you
set how much the magboots slow you down when not activated, by default
SHOES_SLOWDOWN (same behaviour as before). Clown magboots use
SHOES_SLOWDOWN+1, same speed as clown shoes.

Removed redefinition of toggle as the magboots can now use the original
toggle properly.

Removed var/footstep which was copy pasted from the original clown
shoes, as far as I can tell it is not used or checked anywhere and
removing it does not silence squeeks or change any other behaviour.

Added sprites for the item icon and the mob's shoes when activated and
deactivated (adds a little red light that can be seen by a keen eye when
the shoes are activated)
2018-06-29 20:22:22 +02:00
datlo ff591585c6 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2018-06-29 18:45:55 +02:00
Crazy LemonandGitHub 2707c022ec Merge pull request #9141 from R1f72r/Highfive
Change the High-five emote time frame from 2.5 seconds to 4 seconds
2018-06-28 11:10:08 -07:00
datlo 8a909e4da5 Clown Magboots V2
changed syndi description and fixed my accidental reverts sorry for the
commit spam I still stuck at github
2018-06-28 12:10:22 +02:00
datlo 0100f679b0 Revert "Clown Magboots V1"
This reverts commit 38d0c3652c.
2018-06-28 12:03:11 +02:00
datlo c7392d2d54 Revert "woops"
This reverts commit 06eeae5b06.
2018-06-28 12:03:06 +02:00
datlo 31ff0cd6e4 Revert "Revert "woops""
This reverts commit cab9162d18.
2018-06-28 11:42:06 +02:00
datlo cab9162d18 Revert "woops"
This reverts commit 06eeae5b06.
2018-06-28 11:40:21 +02:00
monster860 0bba370d00 Readds the mining podbay 2018-06-27 18:54:57 -04:00
datlo 06eeae5b06 woops
missed a couple of lines
2018-06-27 23:42:24 +02:00
datlo 38d0c3652c Clown Magboots V1
Item created, added to uplink
2018-06-27 23:39:17 +02:00
Kyep 477d7c4e67 fixes specops tables 2018-06-27 12:08:36 -07:00
Anasari 9cf8bd06c3 Fix, again 2018-06-27 21:39:19 +08:00
Anasari 02a0670826 Oops 2018-06-27 21:06:22 +08:00
ParadiseSS13-Bot a8ba3a03d2 Automatic changelog compile, [ci skip] 2018-06-27 03:40:31 +00:00
Crazy LemonandGitHub 8b28d11d7a Merge pull request #9144 from Fox-McCloud/admin-say-log
Adds Admin Say Log Configuration
2018-06-26 19:44:51 -07:00
ParadiseSS13-Bot a1740e3c12 Automatic changelog generation for PR #9114 [ci skip] 2018-06-26 22:29:56 -04:00
Fox McCloudandGitHub bfac50ef12 Merge pull request #9114 from MINIMAN10000/Fix-Emitters
Fix emitters
2018-06-26 22:29:55 -04:00
Fox McCloud 31eb468bb5 Adds Admin Say Log Configuration 2018-06-26 21:01:22 -04:00
Citinited e73ce56370 crazylemon tweaks 2018-06-26 22:18:27 +01:00
ParadiseSS13-Bot 40737f9114 Automatic changelog compile, [ci skip] 2018-06-26 09:08:30 +00:00
Anasari 5a09245029 Change to attack logs. Use ATKLOG_ALL 2018-06-26 16:47:09 +08:00
Anasari 6c8bba3f63 Merge branch 'master' into CryoLog 2018-06-26 16:24:29 +08:00
ParadiseSS13-Bot c300bf5b9e Automatic changelog generation for PR #9111 [ci skip] 2018-06-26 03:05:29 -04:00
Crazy LemonandGitHub 39eee98526 Merge pull request #9111 from Allfd/spacenurf
Add space check to atmos throwing
2018-06-26 00:05:28 -07:00
Crazy LemonandGitHub 6fe83a6987 Merge pull request #8983 from FreeStylaLT/removes_mapping_nonsense
Removes huge mapping inconsistency & headache / Free will strangle anyone who uses these fucking instances in the future
2018-06-26 00:02:07 -07:00
R1f72randGitHub c38783af57 Update neutral.dm 2018-06-25 07:32:38 -04:00
MINIMAN10000 6a8a1e9dbc Removed redundant src. 2018-06-25 00:47:10 -07:00
tigercat2000andGitHub 5df163f4fd Merge pull request #9136 from Superhats/master
Cleans up the sofas
2018-06-24 12:26:52 -07:00
ParadiseSS13-Bot f994e361de Automatic changelog compile, [ci skip] 2018-06-23 02:13:09 +00:00
ParadiseSS13-Bot 31abf01f3b Automatic changelog generation for PR #8895 [ci skip] 2018-06-22 03:09:04 -04:00
tigercat2000andGitHub 27841fdd5a Merge pull request #8895 from matt81093/death_squid
Death Squid hitbox adjustment
2018-06-22 00:09:02 -07:00
tigercat2000andGitHub e82b2484e4 Merge pull request #9129 from Fox-McCloud/honkkkkkkk
Customize Honk Sound for Clown Uniform
2018-06-22 00:00:24 -07:00