Commit Graph

13520 Commits

Author SHA1 Message Date
Crazylemon64
ac3db33709 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-07-04 14:54:49 -07:00
Crazylemon64
27ee3c7247 It's re-entrant now 2016-07-04 14:52:19 -07:00
Fox McCloud
1fff3832b2 Merge pull request #4869 from Krausus/BorerFixes
Borer Fixes
2016-07-04 12:06:35 -04:00
Fox McCloud
3c322eb511 Merge pull request #4858 from Krausus/ExamineInconsistencies
Fixes Mob Examination Inconsistencies
2016-07-04 12:05:14 -04:00
Fox McCloud
75addc56d3 Merge pull request #4855 from Krausus/LoadoutPointsAndFixes
Loadout Points Config Option and Loadout Fixes
2016-07-04 12:03:07 -04:00
Krausus
32c5220f4c Borer fixes
- Fixes borers dying to environmental damage while inside a host.
- Fixes borers not releasing control of a host when it dies.
- Fixes borers being able to assume control of dead hosts.
- Fixes borers being able to talk to their host while dead.
- Fixes borers being told they can't leave their host while
incapacitated/dead, but then trying to leave it anyway.
- Removes an unused proc.
2016-07-04 02:45:49 -04:00
Crazylemon64
a44808f195 Final map tweaks 2016-07-03 17:17:56 -07:00
Crazylemon64
2c4d8e9b6a You can now load the cyberiad runtime-free 2016-07-03 15:36:38 -07:00
Krausus
76468bc5a4 Fixes some examine inconsistencies 2016-07-03 03:04:36 -04:00
Crazylemon64
2a56c57bcf Allows for deferred initialization after round start 2016-07-02 23:25:21 -07:00
Crazylemon64
f2b48c7c67 You can now load the cyberiad with the map-loader 2016-07-02 22:50:45 -07:00
Krausus
a8dee00ba1 Fixes "make whatever" confirmation dialogs 2016-07-03 00:46:49 -04:00
Krausus
3b164cd8aa Loadout fixes and loadout points config option
- Adds a configuration option for loadout points.
- Fixes the blue plaid skirt lacking its own unique type, causing
runtimes due to the mismatch between its display_name and
initial(display_name).
- Fixes the gear selection table using a fixed width.
- Fixes the restrictions column not consistently being added.
- Fixes the header and footer lacking the proper column span to account
for the restrictions column.
2016-07-03 00:24:40 -04:00
TheDZD
9e5fc84bb9 Merge pull request #4845 from Fox-McCloud/armor-rebalance
TG Armor Rebalance
2016-07-02 19:26:41 -04:00
TheDZD
62a1fc5a70 Merge pull request #4417 from tigercat2000/bay_equipping
Bay/Polaris loadouts
2016-07-02 19:26:21 -04:00
Fox McCloud
f1bb017d59 Merge pull request #4844 from Krausus/JustWaitASecond
Adds Short Delay to Late-Join Job Selection
2016-07-02 19:15:28 -04:00
Crazylemon64
0e50e4f27a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_ruins 2016-07-02 15:37:58 -07:00
Krausus
f771e09ce2 Fixes very early logging runtiming
- Fixes log_to_dd runtiming if called before config exists
- Fixes the error viewer runtiming if it tries to show admins an error
before config exists
2016-07-02 09:33:35 -04:00
Fox-McCloud
17d7f8113d tweaks 2016-07-02 01:45:44 -04:00
TheDZD
df961b29bc Merge pull request #4829 from Fox-McCloud/patch-the-patches
Instant Patch Features
2016-07-01 22:08:27 -04:00
TheDZD
21ebb83b7a Merge pull request #4835 from Fox-McCloud/sniping-nukies
Adds Sniper Rifle to Nuke Ops Uplink
2016-07-01 20:36:48 -04:00
TheDZD
506f6885a8 Merge pull request #4834 from Fox-McCloud/emote-revert
Reverts Emote System
2016-07-01 20:36:40 -04:00
Fox-McCloud
fa240a7c56 tweaks 2016-07-01 19:59:09 -04:00
Fox-McCloud
1dc331b5a4 TG Armor Rebalance 2016-07-01 18:35:01 -04:00
Krausus
3f4e15e35a Adds 1-second delay to late-join job selection 2016-07-01 17:22:26 -04:00
Fox McCloud
b0a1381c37 Merge pull request #4828 from Kyep/suggested_version
Adds warning when client BYOND version is old
2016-07-01 16:38:59 -04:00
Krausus
03fa9c1818 Adds KEEP_TOGETHER to ghost images (#4839) 2016-07-01 12:59:07 -04:00
monster860
64b54498ff Fix #4793 (#4794)
* Fix #4793

* makes it actually work

* Fixes stuff, now it should look identical to the original

* Theere, now it's PERFECT.
2016-07-01 12:03:19 -04:00
Kyep
0da6dcfd9d Deletes a to_chat 2016-06-30 22:59:07 -07:00
Tastyfish
4dd64607dd Makes Space Hotel Great Again (#4700) 2016-06-30 20:42:29 -04:00
Tigercat2000
567e1576f5 Merge remote-tracking branch 'upstream/master' into bay_equipping
Conflicts:
	code/modules/client/preference/preferences_toggles.dm
2016-06-30 17:40:10 -07:00
FreeStylaLT
38dfb6db6f Adds appropriate HUH, KUH, KYAH, WROOAAAAH, etc. sounds to sleeping carp (#4798) 2016-06-30 20:39:41 -04:00
Aurorablade
c5dffdbbc1 Adds comfirms to admin player transforms (#4799)
* Adds comfirms to admin player transforms

* alert changes/additions
2016-06-30 20:20:36 -04:00
Krausus
6a8ea1db53 Categorizes Late-Join Job List (#4826)
* Late-Join Job List Categorization

* Late-Join Job List Columnization
2016-06-30 20:19:28 -04:00
Fox-McCloud
19f98e860c Adds Sniper Rifle to Nuke Ops Uplink 2016-06-30 20:07:13 -04:00
Fox-McCloud
a2ac239426 Reverts Emote System 2016-06-30 19:13:13 -04:00
TheDZD
3a262b7a67 Merge pull request #4777 from Kyep/mindshield
Renames Loyalty implants to Mindshield implants
2016-06-30 12:03:03 -04:00
TheDZD
784b299fe2 Merge pull request #4822 from Fox-McCloud/laughter-demon
Ports TG's Laughter Demon
2016-06-30 11:25:58 -04:00
TheDZD
252f442c67 Merge pull request #4830 from Fox-McCloud/you-little-butt
Fixes Sound/Debug Preferences
2016-06-30 11:20:21 -04:00
Fox-McCloud
2df7ff16d8 Fixes Sound/Debug Preferences 2016-06-30 10:57:58 -04:00
Fox-McCloud
cf1a584995 Instant Patch Features 2016-06-30 09:55:35 -04:00
Kyep
c60ee477e8 Adds warning when client BYOND version is old
Adds a chat text warning when a client connects to the server with a
version of BYOND which is at least one major version behind what is
current.
E.g we've declared the standard to be 510, and they connect with 509.

This warning does not actually stop them doing anything. It just tells
them to go update their BYOND.

This does not support minor versions (e.g: 510.1347) because the
client's "byond_version" var only reports the major version number.
Still, should help remind people who return to the game after an absence
to update their client before playing.
2016-06-29 23:49:30 -07:00
TheDZD
cdcd4a64de Merge pull request #4824 from Fox-McCloud/lobby-fix
Lobby Players Ready Fix
2016-06-29 22:15:42 -04:00
Fox-McCloud
cf63c2f47e Lobby Players Ready Fix 2016-06-29 13:21:44 -04:00
tigercat2000
282e8088b2 Runtime & Goonchat fixes (#4820)
* Fix goonchat banned-cookie misdetection

* Runtime fixes

* Fix #4813

* Fix #4818

* Whoops.

* Actual emote runtime fix
2016-06-29 11:12:16 -04:00
Fox-McCloud
d61583dd1f better handling 2016-06-29 11:08:51 -04:00
Tastyfish
cc1f984136 Fixes a bunch of to_chat runtimes (#4817)
* Fixes a bunch of to_chat runtimes

* also that one
2016-06-29 08:31:27 -04:00
VampyrBytes
8eea7c1dd7 Stops vehicles unintentionally being space vehicles (#4805)
So, it turns out you can be pulling a vehicle whilst riding it, and then
when you reach space the vehicle thinks it is being pulled through space
rather than ridden.

I would guess this is why it's been so hard to replicate... People have
pulled the vehicle, then got on it and not realised they're still
pulling it.

Ideally we'd be able to stop people pulling it when riding it, but that
would either mean snowflaking into the pull code (yuk) or refactoring
the pull code, which doesn't seem worth it for just this, so instead
I've just added a check to make sure if it's being pulled through space
it isn't the buckled mob doing it

fixes #4498
2016-06-28 15:55:14 -04:00
monster860
d57299ca01 Fix #4801 (#4802)
* Fix #4801

* Apparently, that made the problem worse... This should work better.
2016-06-28 15:54:57 -04:00
monster860
4bf28bdc33 Wormhole gun fixes and changes (#4792)
* Wormhole gun fixes and changes

* icon_state

* Revert lack of decay chance
2016-06-28 11:33:26 -04:00