Commit Graph

20790 Commits

Author SHA1 Message Date
SteelSlayer
46ad75ec14 Revert "taking player_panel out to the woodshed"
This reverts commit 8fc8063c74.
2019-09-09 08:46:43 -04:00
SteelSlayer
8fc8063c74 taking player_panel out to the woodshed 2019-09-09 02:00:31 -04:00
SteelSlayer
275266a73a Admin verb mega update
changes/removes all sorts of admin verbs, requested by Kyet
2019-09-09 01:26:50 -04:00
variableundefined
ae12fa7dd6 Merge pull request #12111 from KasparoVy/tiger_by_the_tail
Adds Taj Striped Tail Marking, Allows Tiny+Short Tails for Taj, Renames Vulp Tails
2019-09-08 08:58:53 -04:00
variableundefined
674d138558 Merge pull request #12226 from Ty-Omaha/Spam-gloves
Adds headpat gloves to arcade prizes
2019-09-08 08:51:20 -04:00
Fox McCloud
5d61ebfee4 Merge remote-tracking branch 'upstream/master' into lavaland-udpate-split 2019-09-08 04:05:25 -04:00
Fox McCloud
92411d7a02 Merge pull request #11853 from Kyep/ts_gateway_fix
Terror Spider Fixes & Tweaks
2019-09-08 03:51:59 -04:00
Fox McCloud
c0581b48e5 sprite updates 2019-09-08 03:25:40 -04:00
Fox McCloud
4162226cb1 Merge remote-tracking branch 'upstream/master' into lavaland-udpate-split 2019-09-08 02:07:06 -04:00
variableundefined
89dc45e057 Merge pull request #12230 from Fox-McCloud/tendril-refactor
Refactors Spawners/Tendrils
2019-09-07 20:22:22 -04:00
Fox McCloud
8587f63982 Refactors Spawners/Tendrils 2019-09-07 20:02:53 -04:00
Ty-Omaha
96968d442c stuff 2019-09-07 17:39:48 -04:00
Coul
57d7fc60d7 add restricted flag to zombie 2019-09-07 16:03:13 -04:00
Ty-Omaha
79ea0cef50 headpat gloves 2019-09-07 07:38:03 -04:00
Kyep
49a4e57186 fixes prince special attack animation 2019-09-07 00:52:49 -07:00
Kyep
6b11f4e18f fixes animation when AI controller spider breaks a light 2019-09-07 00:25:52 -07:00
Kyep
c5b4cdab3a fixes eggs not causing confusion as intended 2019-09-06 23:58:43 -07:00
Kyep
2e1adac158 reduces gray spider regen speed 2019-09-06 23:40:35 -07:00
Fox McCloud
0119d350b4 Lavaland Update Part 2: Mobs 2019-09-07 02:26:31 -04:00
variableundefined
4dd1ab9721 Merge pull request #12220 from Fox-McCloud/lavaland-update-mech-scanner
Lavaland Update: Mechs and Scanners
2019-09-06 20:22:05 -04:00
variableundefined
b5860a7bfc Merge pull request #12016 from SomeSortaSquid/karma-fix
Karma purchase infinite loop fix
2019-09-06 19:29:39 -04:00
Fox McCloud
0854f75f7b Fixes Pugs 2019-09-06 19:06:41 -04:00
Fox McCloud
d79f983732 Lavaland Update: Mechs and Scanners 2019-09-06 18:45:30 -04:00
AzuleUtama
c6c426d363 Headpat Gloves now use same click speed as the North Star gloves 2019-09-06 18:36:02 +01:00
variableundefined
854e5de97f Merge pull request #12206 from Fox-McCloud/refactors-corgis
Refactors Corgis and Other Doggos
2019-09-05 21:17:53 -04:00
Fox McCloud
10d3c7e463 Merge pull request #12117 from variableundefined/ResolvingProblem
Add a quick resolve button to mentor and adminhelp ticket
2019-09-05 20:06:16 -04:00
variableundefined
02afb2f781 Merge pull request #12212 from AzuleUtama/grammarStuff
Fixes a couple of item descriptions
2019-09-05 19:52:13 -04:00
Fox McCloud
8f91f8a2fc last tweak 2019-09-05 19:39:27 -04:00
Fox McCloud
a54cac4887 foxes are canines 2019-09-05 19:18:24 -04:00
Fox McCloud
b4863db46f further tweaks 2019-09-05 18:44:55 -04:00
AzuleUtama
7c54de5442 Fixes a couple of object descriptions 2019-09-05 23:01:19 +01:00
Coul
2986205dfa another blood fix 2019-09-04 21:32:28 -04:00
variableundefined
bad0b27e31 Merge pull request #12197 from Fox-McCloud/space-carp-tweak
Tweaks Space Carp Event: Improve Performance
2019-09-04 18:53:25 -04:00
Fox McCloud
dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
variableundefined
dbce07a0f4 Merge pull request #12194 from Ionward/tailed-suit-update
More Species Suits/Helmets
2019-09-04 08:50:01 -04:00
Fox McCloud
f9db7841fc another oops 2019-09-04 03:16:56 -04:00
Fox McCloud
a7cc0db002 Fixes Romerol Reagent Pathing 2019-09-04 00:08:46 -04:00
variableundefined
99fd003586 Merge pull request #12203 from Fox-McCloud/fixes-romerol
Fixes Romerol--Comments it Out Until Refactor
2019-09-04 00:01:23 -04:00
Fox McCloud
e5cc59bfca ensures sleepy pens work 2019-09-03 23:42:34 -04:00
Fox McCloud
614f768639 forgot this 2019-09-03 23:24:11 -04:00
Fox McCloud
8b72c3b64a Fixes Romerol--Comments it Out Until Refactor 2019-09-03 23:16:32 -04:00
Kyep
0881948243 fixes graphics bug with grays 2019-09-03 20:15:32 -07:00
Kyep
f4f20211ae squash 2019-09-03 19:29:02 -07:00
Kyep
3d58873b9a revert all changes to giant_spider.dm 2019-09-03 19:16:34 -07:00
Kyep
0102aff057 fixes merge conflict 2019-09-03 19:10:19 -07:00
variableundefined
5d813dce6c Merge pull request #12157 from Fox-McCloud/simple-mob-update
TG Simple Mob Update
2019-09-03 21:50:24 -04:00
variableundefined
271c62dbef Merge pull request #11535 from Couls/zombies
[Ready for review] Romerol Virus, Zombies!
2019-09-03 20:58:53 -04:00
Couls
7ad4479f58 description not message 2019-09-03 20:39:31 -04:00
variableundefined
8b7ffdd7ce Merge pull request #12198 from Fox-McCloud/personal-crafting-update
Updates/Refactors Personal Crafting
2019-09-03 19:01:47 -04:00
Ionward
67d9ea8dd1 properly uses flags_inv for real hopefully 2019-09-03 15:47:40 -07:00