Commit Graph

4158 Commits

Author SHA1 Message Date
tigercat2000 b316f484e6 Merge pull request #7609 from Vivalas/splint_nerf
Makes surgery great again (nerfs splints)
2017-10-15 14:00:17 -07:00
tigercat2000 b8d6051c66 Merge pull request #7482 from Aurorablade/DreamFluff
Phantasmic Dream Fluff:Zekes Tendrils
2017-10-15 13:53:02 -07:00
Ansari fa3f1ba819 actually make it unembeddable 2017-10-14 13:53:57 +08:00
Ansari 00feecc110 Damnit Imsxz 2017-10-14 13:38:41 +08:00
Kyep 65d4719835 stops antagbanned players being mindslaved
squash
2017-10-09 21:46:38 -07:00
Aurorablade 73b0f32927 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-10-07 22:46:57 -04:00
tigercat2000 adbb2a9c06 Merge pull request #8168 from scrubmcnoob/Abductor-Megaphone-FIx
Abductor Megaphone Fix
2017-10-07 11:25:04 -07:00
tigercat2000 8e6240b13b Merge pull request #8190 from Anasari/NerfMiniSquishFlowToday
Nerf yellow slime cell & Buff ion thruster
2017-10-07 10:56:58 -07:00
tigercat2000 988939aa37 Merge pull request #8169 from uraniummeltdown/whetstone
New Cult Whetstone Sprite
2017-10-07 10:31:26 -07:00
Ansari ed64971e8a Nerf slime cell charge rate to 500, from 1500 2017-10-03 20:42:21 +08:00
uraniummeltdown 5300b90496 change whetstone notice spans to warning 2017-09-30 22:51:19 +04:00
uraniummeltdown c067dcf385 new cult whetstone sprite 2017-09-30 22:48:18 +04:00
scrubmcnoob ec6f2f52fc Megaphone FIx
Fixed
2017-09-30 14:43:31 -04:00
uraniummeltdown 6b93bf0d1f adds obj sprite, back sprite and inhands for air tanks 2017-09-30 10:05:56 +04:00
Mars 2fae0f1739 isrobot check 2017-09-28 12:15:52 +02:00
tigercat2000 0e44384945 Merge pull request #7465 from Fox-McCloud/peacekeeper-borgs
Adds Peacekeeper borgs; Retains Secborgs
2017-09-27 17:23:16 -07:00
Fox-McCloud 9c3d0a9f8a bleh 2017-09-27 20:06:19 -04:00
Fox-McCloud e1ce6fac3b oops 2017-09-27 19:21:25 -04:00
Fox-McCloud 70d79e38f1 fixes 2017-09-27 16:01:48 -04:00
uraniummeltdown fe9fba469b adds the RPD to autolathe and engiborgs, adjusted RPD materials to match the expensive autolathe price 2017-09-25 19:43:54 +04:00
tigercat2000 4f452b2eae Merge pull request #8023 from Birdtalon/defibrilator-shortcut
Control Click shortcut for defibrillator toggle paddles verb
2017-09-24 13:16:50 -07:00
Mars 6f736f4254 Wound, not would 2017-09-24 17:37:15 +02:00
Crazy Lemon 3eaff16f45 Merge pull request #7790 from tigercat2000/vv_improved
VV Refactor & Upgrade
2017-09-17 15:13:04 -07:00
Crazy Lemon a5e72accde Merge pull request #8052 from Fruerlund/spectrometers
Fixes spectrometers
2017-09-15 10:48:12 -07:00
tigercat2000 60e287c019 VV Refactor
Ports /tg/'s VV refactor. Most of this is just cleaning up and making it
easier on the coders, but everyone else benefits too:

 - Mass mod no longer freezes the server (CHECK_TICK <3)
 - Attempting to change any of the step_* values or anything that will
 otherwise disable pixel movement will now prompt you and ask if you are
 sure you want to continue
 - You can actually enter |text| again in a box, rather than being
 forced to always use the multi-line input
 - Cookies! VV saves your search and scroll position for a given UID,
 rather convenient for debugging
 - The refresh button on /clients works finally
 - You can view lists in detail by clicking on them like any other
 reference, and edit them directly that way. This also means there is no
 hard limit on how many variables you can see in a list before it's
 truncated- it will just be hidden until you view the list in VV
 directly.
 - You can shuffle lists and clear duplicate/null entries.
 - Mildly reordered the stuff in the dropdown, inconvenient but
 necessary.
2017-09-14 14:08:38 -07:00
tigercat2000 484af3afc4 Merge pull request #7827 from FalseIncarnate/plumbing
Plumbing Update
2017-09-12 20:20:23 -07:00
tigercat2000 ab4ca3ae38 Merge pull request #8055 from Kyep/wolono
Nerfs missionary/wololo staff
2017-09-12 20:00:21 -07:00
Vivalas 4fb6c0365e Merge remote-tracking branch 'upstream/master' into splint_nerf 2017-09-09 19:21:33 -05:00
Birdtalon 4bc42a609d paint bucket fix 2017-09-09 20:12:17 +01:00
Kyep 3a70eb0e31 Removes zealots_made 2017-09-08 16:46:39 -07:00
Kyep 1935856563 Warning on conversion attempt 2017-09-07 12:51:48 -07:00
Kyep b590800215 Changes nerf. No more damage. Now longer delay / blocked by mindshields 2017-09-07 12:18:53 -07:00
Kyep c2db663d62 Adds random multiplier 2017-09-07 02:26:18 -07:00
Kyep e61af42f00 Nerfs missionary staff 2017-09-07 02:06:43 -07:00
Fruerlund 722a493747 Fixes Commits
Yes
2017-09-06 19:41:41 +02:00
Aurorablade df3d13ad7d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-09-02 22:49:05 -04:00
Birdtalon ea18a5f474 bugfix 2017-08-29 15:48:21 +01:00
Birdtalon 13af501432 ctrl click shortcut to toggle paddles on defibrillators 2017-08-29 14:04:42 +01:00
tigercat2000 c281ee7b77 Revert "Buffs the HoP Door remote" 2017-08-28 21:35:18 -07:00
Fox McCloud 70cd062699 Merge pull request #7999 from Birdtalon/door-remote
Buffs the HoP Door remote
2017-08-28 18:23:55 -04:00
Crazy Lemon fdc8c6dc37 Merge pull request #8010 from Birdtalon/bee-cease
Makes Syndicate Bee-case sound local.
2017-08-28 15:10:34 -07:00
Birdtalon ad703a69a1 makes the bee-case sound local 2017-08-24 23:58:24 +01:00
Aurorablade 9956a4a90a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DreamFluff 2017-08-23 17:37:22 -04:00
Birdtalon d7a6833268 alters door remotes 2017-08-22 16:12:12 +01:00
FalseIncarnate 676937a1cb Mountables "rose" span removal
Removes the rose class from spans in mountables code.

More occurances of this ancient span class have been unearthed and will
be handled in a separate PR since that'd end up being unnecessary bloat
in this PR, plus some of those cases need some fixing anyways (span
without /span)
2017-08-19 01:33:23 -04:00
Fox-McCloud e1200d6a1e Merge remote-tracking branch 'upstream/master' into peacekeeper-borgs 2017-08-16 22:08:07 -04:00
Fox-McCloud 881c0e9d92 Merge remote-tracking branch 'upstream/master' into musics 2017-08-16 19:12:46 -04:00
tigercat2000 608a0b0644 Merge pull request #7759 from Citinited/flagged-for-review
Adds in-hand sprites for missing flags; adds a plasmaman flag; miscellaneous flag tweaks
2017-08-16 12:11:05 -07:00
Vivalas dc0a008fe2 Merge branch 'master' into splint_nerf 2017-08-13 23:13:24 -05:00
taukausanake 3e86cb1a8c Merge branch 'Paradise-clean' into buffs_duffs 2017-08-06 22:07:10 -05:00