Commit Graph

22686 Commits

Author SHA1 Message Date
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
TheDZD
9cf452e2be Merge pull request #4846 from Fox-McCloud/shield-fix
Fixes a Few Non-Respected Shields
2016-07-02 14:26:09 -04:00
Fox-McCloud
85384036e9 tweak 2016-07-02 14:10:16 -04:00
FreeStylaLT
fb12e713a7 LETS ALL TAKE A MOMENT TO REMEMBER TO USE MAPMERGER. ESPECIALLY ME. PLEASE. FOR THE SAKE OF ALL THAT IS HOLY PLEASE. 2016-07-02 18:26:20 +03: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
d98af32ce1 Fixes a Few Non-Respected Shields 2016-07-02 02:42:25 -04:00
Fox-McCloud
17d7f8113d tweaks 2016-07-02 01:45:44 -04:00
SamCroswell
c169dfc3d3 Makes the description reflect the nature of the language better 2016-07-01 22:09:46 -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
SamCroswell
74520a9a0b Language Removal Fix 2016-07-01 22:01:09 -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
SamCroswell
574eff21ad Grey Language 2016-07-01 20:35:54 -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
SamCroswell
77e20435c8 Removes the style 2016-07-01 15:59:49 -04:00
SamCroswell
312e1546d2 Fixes An Errant Else If 2016-07-01 15:49:44 -04:00
TheDZD
c9faca22a0 I accidentally Git 2016-07-01 15:06:53 -04:00
SamCroswell
c09f8f65eb Removes Grey's Wingdings 2016-07-01 14:52:12 -04:00
Fox McCloud
d5dcb90b99 Merge pull request #4832 from TheDZD/this-is-why-we-can't-have-nice-things
Tones Down Vampire Space/Chapel Burning
2016-07-01 13:59:32 -04:00
FalseIncarnate
496c3a7843 Paradise Pop
Adds in a new Bottler machine used to combine a set of three ingredients
into a beverage!

Adds a new line of drinks, branded Paradise Pop, to be made with the
bottler. Currently, the possible flavors are:
- Paradise Punch
- Apple-pocalypse
- Berry Banned
- Blackeye Brew
- Grape Granade
- Meteor Malt
These beverages currently have no mechanical effect, though that will be
added at a later date along with additional recipes

The bottler can dispense empty glass bottles, plastic bottles, or metal
cans as well as fill these containers with the result of a processing of
ingredients. Successful processing requires both careful selection of
ingredients AND proper ordering, or else the entire drink is rendered a
horrible and nigh-undrinkable disaster.

Used cans and bottles, both from the bottler and the vending machines,
can be reinserted for recycling even when crushed, so pick up that can!
Clown stole all your cans and bottles for his latest prank? Simply slide
in some sheets of glass, plastic, or metal to restock the machine's
reserves!

Order your Bottler today from cargo for only 35 supply points, and we'll
even throw in a free wrench to help you move it to its new home! (will
map one into the bar later)

Minor other changes:
Sugarcane and grapes received kitchen_tag values, so they may be used in
the bottler
- Also allows grapes to be properly juiced again in a blender
Water bottles from the vendors now are plastic bottles, instead of glass
2016-07-01 13:31:09 -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
monster860
311d68f520 adds trange, comments out define for vars 2016-06-30 19:39:52 -04:00
Fox-McCloud
a2ac239426 Reverts Emote System 2016-06-30 19:13:13 -04:00
monster860
b0d1af7f12 Fine, be picky about what kinds of comments I can put. 2016-06-30 15:59:32 -04:00
monster860
bd3d3b1d9c Remove smoothing for now 2016-06-30 15:37:09 -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
e9e7f51718 Tones down vampire chapel/space burning 2016-06-30 11:48:56 -04:00
TheDZD
398d2ec569 Fixes instances gun_turret not properly firing projectiles (#4831) 2016-06-30 11:34:12 -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
VampyrBytes
e783be45dc fixes farting dead (#4823)
fixes #4821

wasn't anything to do with the deathgasp fix, and it was only the *me
emote, but yeah, not good

🆑 VampyrBytes
fix: No more *me emoting from your corpse!
/ 🆑
2016-06-29 13:23:17 -04:00
Fox-McCloud
cf63c2f47e Lobby Players Ready Fix 2016-06-29 13:21:44 -04:00