Commit Graph
20391 Commits
Author SHA1 Message Date
FalseIncarnate ea3eff7651 Derp-code fix
Also adds a comment for someone else's code because they wanted me to.
2016-03-01 21:31:46 -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
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
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 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
Tastyfish e82163b082 Fixes simple_animals in unsimulated turfs. 2016-02-27 04:32:16 -05:00
Tastyfish b55f79f754 Adds soda dispenser to beach bar. 2016-02-27 03:24:48 -05:00
Tastyfish cb2989eea1 Gave the beach an edge instead of endless void. 2016-02-27 03:03:23 -05:00
Fox-McCloud ceff7afe94 noir mode 2016-02-26 22:10:27 -05:00
Tastyfish 1dc508d305 Also stops ghosts from triggering infra 2016-02-26 22:03:37 -05:00
Tastyfish 1287f7eb70 Fixes infrared assemblies 2016-02-26 21:11:26 -05:00
Fox-McCloud f3b29843cb Fixes 'Yeah' Glasses 2016-02-26 20:58:55 -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 6f02fb3c13 Merge pull request #3699 from VampyrBytes/forceMove(null)
Allows forceMove to move objects to nullspace
2016-02-26 18:16:25 -05:00
TheDZD d6bae511d3 Merge pull request #3715 from Tastyfish/frame-canvas
Disables canvas support on frames
2016-02-26 18:11:06 -05:00
Tastyfish 9f2dd0314a Alright 2016-02-26 18:02:29 -05:00
Tastyfish f9ed173378 Temporarilly disables canvas support on frames 2016-02-26 17:51:40 -05:00
TheDZD 7caf8d8a5e Merge pull request #3696 from Fox-McCloud/whetstone
Ports Whetstones
2016-02-26 17:48:38 -05:00
Tastyfish ca8a8c031f Fixes some of the pda's not initializing, oops 2016-02-26 17:42:23 -05:00
Aurorablade 8e4681eeda you could say...
this line of code is out of sight..out of mind...
2016-02-26 05:59:34 -05:00
Fox McCloud f2a26982cf Merge pull request #3708 from Tastyfish/zebra-plates
Fixes custom plating style issues
2016-02-26 03:19:46 -05:00
Fox McCloud f61b0c0a12 Merge pull request #3711 from Tastyfish/cartdoors
Allows wheelchairs, janicarts, and ambulances to open doors
2016-02-26 01:59:56 -05:00
Tastyfish a6ad21b2e3 Allows wheelchairs, janicarts, and ambulances to open doors 2016-02-26 00:54:38 -05:00
Aurorablade 3c7281c2dd changes 2016-02-26 00:52:57 -05:00
FalseIncarnate a4b1f361a5 Buildable Prize Counter Boards and Non-silent Rocks
Fixes Prize Counter circuit boards not being listed in the circuit
imprinter despite having the required research levels

Fixes #3694
2016-02-25 22:44:21 -05:00
Tastyfish 236765ea9c Fixes custom plating designs 2016-02-25 21:25:11 -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
Tastyfish 35501c6dac Fixes crowbarring floors without floor_tile types 2016-02-25 19:35:24 -05:00
Fox McCloud b843aee8d8 Merge pull request #3693 from KasparoVy/Fixes-Labcoat-Adjustment
Jacket Adjustment Fixes/Tweaks
2016-02-25 17:23:43 -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
Fox McCloud bc33bfdda6 Merge pull request #3689 from FalseIncarnate/kitchen
Cocoa Spelling and Relative Pathing Cleanup
2016-02-25 17:01:25 -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
Tastyfish ff06ea50a6 Fixed in-chat pda message reply link 2016-02-25 07:36:36 -05:00
VampyrBytes ff1e2de209 Allows forceMove to move objects to nullspace
as discussed with @tigercat2000
[here](https://github.com/ParadiseSS13/Paradise/pull/2903/files#r54054665)
forceMove now works when the destination is null
2016-02-25 08:55:24 +00:00
Fox-McCloud a4c61c7ee9 Ports Whetstones 2016-02-25 02:03:53 -05:00
KasparoVy 447c3ea779 Default states and cull 2016-02-25 00:48:52 -05:00
KasparoVy aa7de9bb9a Woops. 2016-02-24 23:42:18 -05:00
TheDZD e218379fc6 Merge pull request #3681 from Fox-McCloud/pickpocket-gloves
Tweaks Pickpocket Gloves
2016-02-24 22:58:33 -05:00
Fox McCloud df3859cc80 Merge pull request #3680 from Crazylemon64/miner_walk_ore_collection
Miners can now collect ore by walking on it while having an ore satchel on
2016-02-24 18:29:02 -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