Commit Graph

20824 Commits

Author SHA1 Message Date
variableundefined
bcd64e99be Merge pull request #12255 from Fox-McCloud/shards-glass-lights
Refactors Shards, Improved Light Replacer, Adds Plasmaspear
2019-09-11 10:10:18 -04:00
Fox McCloud
08ac93ae60 Merge pull request #12265 from TDSSS/godblood-fix
Fix really silly mistake
2019-09-11 06:38:47 -04:00
TDSSS
f02cbc4e60 [Comment redacted] 2019-09-11 12:05:47 +02:00
TDSSS
86eb450c56 Fix really silly mistake 2019-09-11 07:48:45 +02:00
variableundefined
ee86b56d58 Merge pull request #12250 from Fox-McCloud/linda-upgrade-prep
Refactors Atmos Air Current Pushing
2019-09-11 01:28:55 -04:00
Fox McCloud
23a580f1ae Merge pull request #12263 from variableundefined/WoodenChairFix
Remove normal subtype of wooden chair
2019-09-11 01:00:41 -04:00
variableundefined
18b270cb7e Remove the structure/chair/wood/normal subtype, moving all properties to its parent. 2019-09-11 00:28:27 -04:00
variableundefined
323409f232 Merge pull request #12262 from Shadow-Quill/Plaslazerbeamgundeaththing
Fixes plasma cutter being able to eat an infinite amount of plasma
2019-09-10 23:03:15 -04:00
Shadow
960424903a :kappap: 2019-09-10 21:51:15 -05:00
Shadow
fda20578d1 HUNGRY HUNGRY :boxen: 2019-09-10 21:35:45 -05:00
variableundefined
bccdd15b6d Merge pull request #12259 from Ty-Omaha/revert-11733-this-has-psised-me-off-long-enough
Revert "Adds Auto-Note for Manual Bans"
2019-09-10 21:54:40 -04:00
variableundefined
ba3651258d Merge pull request #12261 from Terilia/headcrab-fix
Small Headcrab fix.
2019-09-10 21:06:41 -04:00
Terilia
11784c95e2 Headcrab fix 1 2019-09-11 01:48:53 +02:00
variableundefined
e593075332 Merge pull request #12248 from Fox-McCloud/taste-fixes-tweaks
Fixes Some Tastes; Tweaks a Few
2019-09-10 19:38:56 -04:00
variableundefined
5ea0a9a7e3 Merge pull request #12242 from Fox-McCloud/ports-frozen-status-effect
Ports Frozen Status Effect
2019-09-10 19:38:31 -04:00
variableundefined
8077e61d08 Merge pull request #12241 from SteelSlayer/admin-verb-removals
Admin verb mega update
2019-09-10 19:38:00 -04:00
Ty-Omaha
240cf39025 Revert "Adds Auto-Note for Manual Bans" 2019-09-10 17:00:10 -04:00
variableundefined
d649eaf378 Merge pull request #12240 from Fox-McCloud/turf-mineral-lava-update
Lavaland Update Part 3: Fixes Megafauna Spawning, Rivers, and Turfs
2019-09-10 07:54:08 -04:00
variableundefined
8a4bf7b05f Merge pull request #12256 from xProlithium/adminhelpCAtoTP
CA to TP on adminpm and prayers
2019-09-10 07:15:39 -04:00
xProlithium
829d1297cf CA to TP on adminpm and prayers
I missed changing CA to TP on these two folders.
2019-09-10 03:38:26 -04:00
Fox McCloud
40428e47d9 Refactors Shards, Improved Light Replacer, Adds Plasmaspear 2019-09-10 03:08:44 -04:00
Fox McCloud
42564c65f3 Refactors Atmos Air Current Pushing 2019-09-09 20:11:26 -04:00
Fox McCloud
a1f85926ba fix 2019-09-09 17:55:08 -04:00
Fox McCloud
cdd5190e36 Fixes Some Tastes; Tweaks a Few 2019-09-09 17:47:26 -04:00
Fox McCloud
d4a0fb2864 Detect the Detecting Corgi Detective 2019-09-09 16:51:07 -04:00
variableundefined
1270c56ef7 Merge pull request #12236 from Fox-McCloud/vending-machien-refactor-fix
Refactors Vending Machines and Fixes Restocking Exploit
2019-09-09 15:54:08 -04:00
SteelSlayer
4fb7d83595 re-add sticky ban, player_panel, increase width of ssd/afk window a bit 2019-09-09 10:12:58 -04:00
variableundefined
c94d038b53 Merge pull request #12235 from xProlithium/adminhelpCAtoTP
Changed CA to TP link in adminhelp
2019-09-09 09:40:26 -04:00
SteelSlayer
46ad75ec14 Revert "taking player_panel out to the woodshed"
This reverts commit 8fc8063c74.
2019-09-09 08:46:43 -04:00
Fox McCloud
43ae1c832a Ports Frozen Status Effect 2019-09-09 02:45:09 -04:00
SteelSlayer
8fc8063c74 taking player_panel out to the woodshed 2019-09-09 02:00:31 -04:00
Fox McCloud
5d50935f31 Lavaland Update Part 3: Mob Spawning, Rivers, and Turfs 2019-09-09 01:34:02 -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
52ff499c78 Merge pull request #12227 from TDSSS/gps-local
Introduces local gps signals
2019-09-08 13:56:00 -04:00
Fox McCloud
fde5769225 other vending machines 2019-09-08 10:59:04 -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
xProlithium
04540c7b9b Changed ahelp CA to TP
Changed the CA link in admin helps to TP link. Also moved it further up.
2019-09-08 02:17:05 -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
TDSSS
408c068c01 Initial commit 2019-09-07 19:06:57 +02: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