Commit Graph

5208 Commits

Author SHA1 Message Date
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
Crazylemon
8e63a9eea3 Merge branch 'master' of github.com:ParadiseSS13/Paradise into human_icons_tweak 2016-03-03 16:20:15 -08:00
Fox McCloud
b95c24ef34 Merge pull request #3750 from FalseIncarnate/beach
Beach Expansion Update
2016-03-02 23:42:34 -05:00
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
Crazylemon64
b095d40952 i r inteligunt 2016-03-01 12:11:08 -08:00
Crazylemon64
d72a086cd5 Makes the DNA scrambler not give incorrect hairstyles 2016-03-01 11:40:39 -08:00
Crazylemon64
fff283bd2a Organs now properly retain appearance upon cloning and DNA scramble 2016-02-29 22:49:46 -08: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
Fox-McCloud
e2bb00a5b1 Miming Refactor 2016-02-28 22:40:00 -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
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
7caf8d8a5e Merge pull request #3696 from Fox-McCloud/whetstone
Ports Whetstones
2016-02-26 17:48:38 -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
Aurorablade
5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Fox-McCloud
a4c61c7ee9 Ports Whetstones 2016-02-25 02:03:53 -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
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
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Fox McCloud
8d092d226a Merge pull request #3678 from VampyrBytes/Lockboxes
prevents autoequip to locked lockboxes
2016-02-24 02:04:03 -05:00
Fox McCloud
433dde874a Merge pull request #3668 from Tastyfish/frames
Adds picture frames
2016-02-24 02:02:42 -05:00
VampyrBytes
6afc8258a8 Adds same fix to secure storage 2016-02-24 06:54:56 +00:00
VampyrBytes
c343619ebc removes unneeded brackets 2016-02-23 23:39:54 +00:00
VampyrBytes
b138c3eace prevents autoequip to locked lockboxes 2016-02-23 10:05:32 +00:00
Aurorablade
bbac4006b5 fixc all the things. 2016-02-23 02:48:13 -05:00
Tastyfish
02d7c20778 Makes soap & rags not starting a cleaning timer everytime you erase a pixel in canvas 2016-02-22 22:03:34 -05:00
Tastyfish
eff33023d0 Adds canvas support to picture frames 2016-02-22 20:24:57 -05:00
Tastyfish
4f3ce4ecbc Adds picture frames 2016-02-21 21:00:45 -05:00
Fox McCloud
29784c9875 Merge pull request #3650 from TheBeoni/Sandals
Adds new sandals.
2016-02-21 19:26:42 -05:00
Aurorablade
2c38d8fb61 yeah 2016-02-21 05:54:10 -05:00
Fox McCloud
a0263f9c89 Merge pull request #3652 from Crazylemon64/warm_regards
You can now light cigarettes off of burning mobs
2016-02-21 01:27:11 -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
941d992920 Merge pull request #3655 from VampyrBytes/washrefactor
refactors washing items
2016-02-20 17:41:53 -05:00
Fox McCloud
c69d0b877c Merge pull request #3656 from pinatacolada/protectstation
Makes the Protect Station board no longer consider people crew, instead of human
2016-02-20 15:35:35 -05:00
pinatacolada
90678a4c28 Makes the Protect Station board no longer consider people crew, instead of human""
I'm guessing this was an oversight?
2016-02-20 14:01:53 +00:00
VampyrBytes
386ed87126 refactors washing items
fixes #3570
Could have fixed with another if statement in sink/attackby, but it was
already pretty snowflakey, and had the potential to get worse
Items now have a wash proc that the sink calls, that can be overridden
when needed
2016-02-20 12:01:40 +00:00
TheBeoni
156acacb4d Removed sec hailer 2016-02-20 12:43:44 +01:00
TheBeoni
bf7fcec275 Corrected. 2016-02-20 12:33:57 +01:00
Fox McCloud
716edf2533 Merge pull request #3634 from KasparoVy/packbackets
Vox-fitted Back Stuff, Adds Genetic Duffel, Fixing Typos and Refactoring Back-Icon Generation
2016-02-20 02:20:16 -05:00
Fox McCloud
2c4dfb18e5 Merge pull request #3564 from Crazylemon64/better_defibs
Might make the defib more reliable on players who have ghosted
2016-02-20 02:18:55 -05:00
Crazylemon64
6d30b44ac6 You can now light cigarettes off of burning mobs 2016-02-19 21:20:04 -08:00
Crazylemon64
250e07a915 bluh 2016-02-19 21:05:48 -08:00
Crazylemon64
ae3ab870f8 Adds the recommended fixes 2016-02-19 20:42:25 -08:00
TheDZD
84f01d99b9 Merge pull request #3627 from VampyrBytes/adminreagents
fixes #3615
2016-02-19 22:47:00 -05:00
Tastyfish
85cfccf2d9 Refactors renaming so it works consistently 2016-02-19 21:03:33 -05:00
TheBeoni
ce0f5a962a Adds new types of sandals. 2016-02-20 02:56:26 +01:00
Tastyfish
b56f9ed17f Fixes MetaStation directional signs 2016-02-18 22:37:04 -05:00