Commit Graph

12270 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Fox McCloud
f97ee28c0d Merge pull request #3664 from FlattestGuitar/master
IPC Booze and their ability to drink.
2016-02-24 18:13:42 -05:00
Fox-McCloud
fc25f23752 Tweaks Stamina Regeneration 2016-02-24 17:41:02 -05:00
FalseIncarnate
978722c891 Returns chocolate milk recipe to normal
Reverts/fixes an accidental change that would cause issues with making
chocolate bars
2016-02-24 16:44:25 -05:00
FalseIncarnate
d2ae37c540 Cocoa Spelling and Relative Pathing Cleanup
Standardized the spelling of "Cocoa", as this was inconsistent
- One spot refers to it as cacao still, but that is because it is in the
legit latin scientific name. Everything else is now cocoa (not coco).

Chocolate now will provide some nutrition (and make you fat if you eat a
lot)
- Cocoa Powder (the arguably main component of chocolate) provided
nutrition, but that nutrition mysteriously vanished when you combine it
with milk and sugar. Now chocolate provides the same nutrition as the
cocoa powder in it

Merged a number of cases where foods had both chocolate and cocoa to now
have just chocolate
- In the case where both were present, the volumes were combined to
maintain food sizes

Renamed cocoa pile to chocolate pile, as this was wrong
- The cocoa pile claimed to be a pure cocoa powder pile, but was
actually just chocolate that was dumped on the floor.

Removed a fair amount of relative pathing, but there's still more to go.
2016-02-24 16:34:23 -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
Fox McCloud
1663fd359f Merge pull request #3677 from Tastyfish/big-brother-is-watching
Adds verb for super secret administration
2016-02-24 03:40:32 -05:00
Crazylemon64
ba45bfff64 Ore satchels now work equipped in any "body" slot 2016-02-23 23:47:43 -08:00
Fox McCloud
433dde874a Merge pull request #3668 from Tastyfish/frames
Adds picture frames
2016-02-24 02:02:42 -05:00
Tastyfish
549c268ff1 Fixes missing return values in picture frames 2016-02-24 01:54:57 -05:00