Commit Graph

6068 Commits

Author SHA1 Message Date
TheDZD
c84ac16d58 Merge pull request #3748 from VampyrBytes/Emotess
fixes emotess
2016-03-03 20:16:36 -05:00
Fox McCloud
b95c24ef34 Merge pull request #3750 from FalseIncarnate/beach
Beach Expansion Update
2016-03-02 23:42:34 -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
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
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
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
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
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
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
Tastyfish
e82163b082 Fixes simple_animals in unsimulated turfs. 2016-02-27 04:32:16 -05:00
Fox McCloud
166b3951b8 Merge pull request #3676 from Aurorablade/ThePutsaNewShadeOnThings
Fethas Carnival of horrors: A new shade for the detective
2016-02-26 20:02:41 -05:00
TheDZD
43cad40b39 Merge pull request #3706 from Fox-McCloud/pointing
Lets you point while buckled or lying
2016-02-26 19:59:05 -05:00
TheDZD
21b7ccbdba Merge pull request #3717 from Fox-McCloud/silence
Fixes Capulettium Plus
2016-02-26 19:56:54 -05:00
Fox-McCloud
eebdcb693b Fixes Capulettium Plus 2016-02-26 18:54:44 -05:00
TheDZD
48527f4a96 Merge pull request #3690 from Fox-McCloud/stamina-tweak
Tweaks Stamina Regeneration
2016-02-25 20:14:36 -05:00
Fox-McCloud
ce955b8f0c Lets you point while buckled or lying 2016-02-25 20:07:23 -05:00
Fox McCloud
3d4923dc4f Merge pull request #3701 from Spacemanspark/fixes-muh-robot-emotes
Fixes *yes and *no emotes not displaying a message in the chat.
2016-02-25 17:12:26 -05:00
Spacemanspark
a42b41005e Fixes *yes and *no emotes not displaying a message in the chat.
Whoops.
2016-02-25 08:12:02 -06:00
TheDZD
e218379fc6 Merge pull request #3681 from Fox-McCloud/pickpocket-gloves
Tweaks Pickpocket Gloves
2016-02-24 22:58:33 -05:00
TheDZD
807ad6946e Merge pull request #3679 from Fox-McCloud/heart-attacks
Tweaks Heart Attacks
2016-02-24 18:28:12 -05:00
Fox McCloud
111c92000a Merge pull request #3688 from VampyrBytes/ClosetMovement
Fixes movement issues with opening and closing closets
2016-02-24 18:15:04 -05:00
Fox-McCloud
fc25f23752 Tweaks Stamina Regeneration 2016-02-24 17:41:02 -05:00
VampyrBytes
42f4f9b3d2 Fixes movement issues with opening and closing closets
Fixes #3687
Mobs no longer act as if they've moved when in a locker whilst it's
opened and closed.
The new proc does everything forceMove does except trigger /crossed on
/items and run the extra code in turfs\simulated\Entered (still makes
the parent call)
Also removed some now unneeded code from the /slip proc as this makes it
redundant
2016-02-24 21:23:38 +00:00
Crazylemon
da01814113 Completely tears out all uses of the 'update_icon' var in mobs 2016-02-23 21:55:03 -08:00
Fox-McCloud
cbdc93ea6a Tweaks Pickpocket Gloves 2016-02-23 22:56:21 -05:00
Fox-McCloud
3a45f4a081 Tweaks Heart Attacks 2016-02-23 07:36:36 -05:00
Aurorablade
7b5c5c2a13 shade on shade off 2016-02-22 06:03:11 -05:00
Aurorablade
2c38d8fb61 yeah 2016-02-21 05:54:10 -05:00
Fox McCloud
f56914781d Merge pull request #3651 from Tastyfish/better-name-edit
Refactors renaming so it works consistently
2016-02-20 17:51:43 -05:00
Fox McCloud
6a25847277 Merge pull request #3643 from Crazylemon64/gotta_go_slow
No more superspeed simple mob attacking
2016-02-20 15:30:59 -05:00
Tastyfish
848799c603 Removed long and out of date/pointless comments 2016-02-19 21:26:19 -05:00
Tastyfish
85cfccf2d9 Refactors renaming so it works consistently 2016-02-19 21:03:33 -05:00
Crazylemon64
7f47aea249 No more superspeed simple mob attacking 2016-02-19 04:55:11 -08:00
KasparoVy
679218b952 Vox-Fitted Back Stuff, Adds Geneticist Duffel, Fixing Typos and Refactoring Back Icon Generation
Using species_fit and sprite_sheets now works properly for items worn on
the back. Previously it was using the item_state name if it existed in
order to generate the on-mob icon, which was wrong. I restructured it to
work the same way as the rest of the icon generation procs.
2016-02-18 14:59:28 -05:00
Fox McCloud
fe78b45b41 Merge pull request #3578 from Tastyfish/pda-apps
Complete refactor & partial redesign of the PDA
2016-02-18 13:39:37 -05:00
Fox McCloud
dae905d110 Merge pull request #3614 from Crazylemon64/borer_death_fix
Borer enhancements
2016-02-18 13:39:14 -05:00
Tastyfish
e27fb5d27f Stops utensils from working on mouthless humanoids 2016-02-16 22:52:56 -05:00
TheDZD
26f80c2cd3 Merge pull request #3610 from Spacemanspark/more-robot-emotes-because-why-not
Adds *yes and *no emotes to IPCs and other synthetics.
2016-02-16 17:28:16 -05:00
Crazylemon64
6a75ede14d Enhances borers in various ways
- Adds a silent means of two-way conversation between borers and their
  hosts - the borer must make first contact, to avoid spoiling their
  presence

- Borers will now be unable to talk out loud while inside a host, by default -
  they can toggle this with a verb. Borer speech is unaffected.

- Borers will now properly detach from host control upon the death of the
  host

- Borers will now triple their reagent production while sedated by sugar

- Borers infesting and hiding is now silent
2016-02-16 01:48:04 -08:00
Crazylemon64
0ea630f18a Borers will now properly lose control when their host dies 2016-02-15 22:06:53 -08:00
Spacemanspark
4452c24999 Adds *yes and *no emotes to IPCs and other synthetics.
Port of https://github.com/PolarisSS13/Polaris/pull/809
2016-02-15 12:02:03 -06:00
VampyrBytes
f7511ae017 oxyloss change set to only borgs 2016-02-14 10:16:45 +00:00
VampyrBytes
02f3db4183 prevents toxloss and oxyloss for silicons
fixes #3595
stops adjustToxLoss working on silicons, and only allows adjustOxyLoss
when suiciding

Have checked through, nowhere that shouldn't be is directly setting
toxloss and oxyloss, and the only place that uses the setters to set it
to anything other than 0 (statues) doesn't affect silicon based life, so
this will fix the found bug and any other situations is could happen in
2016-02-14 07:44:42 +00:00
Tastyfish
8d51fc8f1e Fixed handcuff hud overlay 2016-02-13 00:39:04 -05:00
Fox McCloud
ce47eefcf2 Merge pull request #3545 from VampyrBytes/BreakSlipLock
walking prevents sliplock
2016-02-12 18:19:50 -05:00