Commit Graph

12404 Commits

Author SHA1 Message Date
Crazylemon64
bfca35a213 Lack of encasement no longer leaves organs vulnerable 2016-03-08 17:11:33 -08:00
Crazylemon64
bdf4b05e16 Switches to a functional #undef statement 2016-03-08 17:05:14 -08:00
Crazylemon64
6c7447c127 Makes the namespacing less ridiculous 2016-03-08 17:00:14 -08:00
Crazylemon64
4f29b1b3ea Namespaced the things and undefined them when done 2016-03-08 16:56:09 -08:00
Crazylemon64
188b4b871f Finalized 2016-03-08 11:04:35 -08:00
Crazylemon64
f8769ff542 Abandoned by time, I finally synchronize with the present. 2016-03-05 02:59:53 -08:00
Crazylemon64
309d9fc9e6 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into slime_fancy_stuff 2016-03-05 02:55:00 -08:00
Fox McCloud
ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
2016-03-04 19:51:50 -05:00
Fox-McCloud
bca54aae9e Experimentor Fixes 2016-03-04 08:31:32 -05:00
Fox McCloud
b5df688605 Merge pull request #3744 from Crazylemon64/human_icons_tweak
Changing a person's appearance now works better
2016-03-03 20:38:18 -05:00
Fox McCloud
60b0d6f2fe Merge pull request #3639 from Crazylemon64/matrix_and_path_editing
Adds matrix and path editing to the variable viewer
2016-03-03 20:31:25 -05:00
TheDZD
37e415909c Merge pull request #3740 from Crazylemon64/better_buildmode
Enhances the buildmode tool
2016-03-03 20:21:34 -05:00
TheDZD
9e05eedf52 Merge pull request #3724 from KasparoVy/redoes-redoing-suit-adjustment
Suit Adjustment Bugfixes, Fixes #3703, Fixes #3707 and Fixes #3752, Adds Blueshield Coat in_hands and Hulk Jacket Destruction
2016-03-03 20:20:37 -05:00
Fox McCloud
96785b1dbe Merge pull request #3757 from Tastyfish/neuromancer
Changes neurotoxin drink name because of name clash with supertoxin
2016-03-03 20:19:22 -05:00
TheDZD
c84ac16d58 Merge pull request #3748 from VampyrBytes/Emotess
fixes emotess
2016-03-03 20:16:36 -05:00
Crazylemon
8e63a9eea3 Merge branch 'master' of github.com:ParadiseSS13/Paradise into human_icons_tweak 2016-03-03 16:20:15 -08:00
Tastyfish
5b76727d73 Changes neurotoxin drink name because of name clash with supertoxin 2016-03-03 15:26:55 -05:00
Fox McCloud
b95c24ef34 Merge pull request #3750 from FalseIncarnate/beach
Beach Expansion Update
2016-03-02 23:42:34 -05:00
KasparoVy
b921c9a6c4 Redoes Redoing Suit Adjustment
@Regens1 for the special hulk joke. Haha?

Hulks can destroy jackets by trying to adjust them. In the case of labcoats, when you destroy it items in the pockets (not just the suit storage slot) will be dumped on the ground below you. Stuff in the suit storage slot already got dumped on the ground, so it didn't need any special treatment.

Fixes all known issues with any adjustable jackets using the wrong sprites, including the HoS jacket

Fixes #3707 and #3703. You can now adjust breath masks while buckled into beds or chairs.

Adds Missing Red Labcoat Sprites (found copies @ the Polaris repository).

Adds Blueshield coat in_hand icons
2016-03-02 03:08:05 -05:00
FalseIncarnate
374c2db600 Beach Expansion Update
Expands the beach away mission to include a brand new scuba-diving area!
- Somewhat empty, but has a few points of interest scattered about and
can be added to in the future

Visually updates the beach
- Sand texture changed, and given randomization for a more varied
beachfront.
- The row of crates and lockers has been replaced with 3 changing
rooms/tents so you can change into that mankini in private.
- Changes the water texture to be less bland
- Expands the water area to give more room for swimmers to play in
before they reach the edge

Adds in the Diving Point Buoy and Diving Point Anchor objects, used to
transition between the beach surface and the underwater area
- Hit with an empty hand to transition between the two points

The underwater area has a few "minor" dangers to prepare for:
- Sea Carp
- These carp (unlike their space-faring cousins) won't attack on sight,
and will try to swim away when attacked. They still bite if they work up
the courage to come back.
- Water
- Water and lungs don't work well together, who knew!? Skrell, Neara,
and anyone who has NO_BREATHE can happily explore, while the rest will
want to pack some internals lest they begin to drown.
- Drowning in the scuba area doesn't require you to be lying down,
unlike the pool. You're in over your head (literally).
- Darkness
- Not quite a danger in itself, but it's easy to get disoriented in the
dark water, and that can be frustrating.

CODE STUFF
- Broke up the pool controller code into a couple procs for cleanliness
and in case we want to have a type of pool controller that doesn't drown
or doesn't adjust bodytemp
- Made ladders use forceMove instead of directly setting loc
- Removed an entirely unused area (/area/beach)

Crappy coder-sprites for Buoy and Anchor done by myself.
- Ok, they actually aren't THAT bad, but they aren't fantastic.
2016-03-01 21:02:15 -05:00
Crazy Lemon
962490bdac Merge pull request #3738 from Fox-McCloud/potatoes
Ensures there are Potatoes
2016-03-01 11:36:30 -08:00
Crazylemon64
91f025c04f This should make sure you don't lose your hairstyle when cloned 2016-03-01 09:35:21 -08:00
Crazylemon64
e7d34830cb Skeletons (from rotted bodies) no longer have a fleshy torso 2016-03-01 08:32:52 -08:00
VampyrBytes
c3c23a5497 fixes emotess
fixes #3727
Removes part of code that removed last character if it was an s
Hardcodes grammatical options for emotes into switch
Updated help emote with missing emotes
2016-03-01 10:29:16 +00:00
Crazylemon64
fff283bd2a Organs now properly retain appearance upon cloning and DNA scramble 2016-02-29 22:49:46 -08:00
Fox McCloud
879f4a9530 Merge pull request #3745 from Tastyfish/announce-fix
Newlines 2 - IC Notes Boogaloo
2016-02-29 22:43:39 -05:00
TheDZD
c3d679eb47 Merge pull request #3736 from Fox-McCloud/miming-refactor
Miming Refactor
2016-02-29 22:42:26 -05:00
Crazylemon64
7e510dfdb6 Changing a person's appearance now works better
Also fixes some problems on changing gender
2016-02-29 19:31:29 -08:00
Tastyfish
402b6a3096 Also adding memories 2016-02-29 22:09:57 -05:00
Fox-McCloud
0c11898f4a not so comical now 2016-02-29 21:54:49 -05:00
Aurorablade
fe3eb50b5e I'M GOING TO OPERATE
OPERATE!
2016-02-29 21:23:25 -05:00
Aurorablade
ac02c8a57d the honk strikes back 2016-02-29 12:00:57 -05:00
Crazylemon64
a816e0e0aa Makes buildmode quit if you switch to another mob, to prevent tragedy 2016-02-29 08:09:47 -08:00
Crazylemon64
a8f890bad1 Updates the buildmode tool to allow for better area generator testing 2016-02-29 07:09:00 -08:00
Crazy Lemon
7e8a2ff237 Merge pull request #3732 from Fox-McCloud/sleeping-carp
Adds Sleeping Carp Scroll to Uplink
2016-02-29 06:36:28 -08:00
Fox-McCloud
33f0d59d9d Ensures there are Potatoes 2016-02-29 07:11:06 -05:00
Aurorablade
960e5526ad the honkening 2016-02-29 07:09:58 -05:00
Fox-McCloud
070bd8d17d tweaks 2016-02-28 23:31:53 -05:00
Fox-McCloud
e2bb00a5b1 Miming Refactor 2016-02-28 22:40:00 -05:00
Fox McCloud
e3953549d3 Merge pull request #3725 from Tastyfish/lifes-a-beach
Gives the beach an edge instead of endless blackness.
2016-02-28 16:49:27 -05:00
TheDZD
e7a7a3c205 Merge pull request #3721 from Fox-McCloud/glasses-fix
Fixes 'Yeah' and Noir Glasses
2016-02-28 16:41:35 -05:00
Fox McCloud
642430833c Merge pull request #3730 from Tastyfish/better-stuns
Fixes stun code to not allow one get stuck stunned/paralyzed etc
2016-02-28 16:22:44 -05:00
Fox McCloud
473dbdf33b Merge pull request #3722 from Tastyfish/infrared
Fixes infrared assemblies
2016-02-28 04:14:07 -05:00
Fox-McCloud
84def6e144 Adds Sleeping Carp Scroll to Uplink 2016-02-28 02:08:32 -05:00
Tastyfish
aed9859b9a Fixes a bunch of things to not circumvent SetStun/SetWeaken/SetParalyse that has no business doing so. 2016-02-28 01:11:36 -05:00
Tastyfish
386db45948 Fixes stun code to not allow one get stuck stunned/paralyzed etc 2016-02-28 00:03:28 -05:00
Aurorablade
60baa8cdeb futher removes the removed things so we can remove while we remove..
then remove the removes so we can remove
2016-02-27 23:22:29 -05:00
Aurorablade
378c5d03bc removes the removed so we can remove while we remove 2016-02-27 22:51:40 -05:00
Tastyfish
b3591c996f beachy beach 2016-02-27 18:07:21 -05:00
FalseIncarnate
d66624e7bd Prize Counter and Toy Fixes
Prize counters now spend your tickets when you purchase something
- Had removed the ticket spending during my testing, forgot to re-add it
before submit

Toy Crossbows now properly display the name of their user when they
"start scrounging for ammo"

Water balloons can now be filled from sinks, ANY reagent dispenser
structure (not just watertanks), and drinking glasses in addition to
beakers and buckets.
- Watch out for security hurling pepper-spray balloons!
2016-02-27 11:06:42 -05:00