Commit Graph

11558 Commits

Author SHA1 Message Date
Fox-McCloud
068bfd10ba TG Mining Update 2015-12-10 21:35:02 -05:00
FalseIncarnate
7ac2826037 Claw Game Fixes
Fixes #2795
- Game will now close if you wander away from the machine
- Cannot use the game while laying down/dead
- Game can now be closed like a normal window, and will behave properly
when doing so
- Dropped prizes will actually visibly fall before the game over screen
appears
- Claw game will now properly use machine processing for power and such

Also some code adjustments to help make it more organized or something.
- Seriously though, it does clean some stuff up and removes a redundant
variable
2015-12-10 06:21:46 -05:00
Fox McCloud
5cc11bc947 Merge pull request #2788 from FalseIncarnate/arcade
Claw Games! (HTML5 Arcade)
2015-12-10 01:07:59 -05:00
Fox McCloud
8502134e9a Merge pull request #2785 from scrubmcnoob/patch-1
Maintenance Drone Vent Crawling
2015-12-09 20:07:42 -05:00
Fox-McCloud
1de87cf143 ASS DAY ALL DAY EVERY DAY TODAY IS ASS DAY 2015-12-09 19:27:41 -05:00
TheDZD
4c2370af89 Merge pull request #2792 from Fox-McCloud/sticky-ban
Sticky Ban Fix
2015-12-09 19:25:28 -05:00
Fox-McCloud
5a1528a76a Sticky Ban Fix 2015-12-09 19:16:16 -05:00
Fox-McCloud
ac9b96a432 Death Nettle Fix 2015-12-09 18:53:24 -05:00
Fox McCloud
3151d84904 Merge pull request #2783 from Crazylemon64/all_sheet_related_puns_i_can_think_of_are_vulgar
Improved Sheet Handling; Better Sci machine resource Formatting
2015-12-09 18:21:54 -05:00
Fox McCloud
f6e7d30805 Merge pull request #2784 from Crazylemon64/robo_flash_and_console_tracking
Roboconsole gives loc and health, Drones now flash right
2015-12-09 17:45:58 -05:00
Fox McCloud
87bd9d2002 Merge pull request #2790 from ParadiseSS13/revert-2771-master
Revert "Reverts #2687"
2015-12-09 17:44:09 -05:00
TheDZD
a4b3b71663 Merge pull request #2779 from Fox-McCloud/nettles
Re-Adds Weapon Based Nettles and Ports Glowcaps, holy water, and salpetre (hydro)
2015-12-09 17:28:34 -05:00
TheDZD
4fe7f81e97 Revert "Reverts #2687" 2015-12-09 17:25:10 -05:00
FalseIncarnate
c47e69dbad Minor html fix 2015-12-09 01:02:25 -05:00
Crazylemon
67366fb5d1 Fixes a bitflag check to work right.
This will probably let you have your hair in character setup again
Haven't tested it though, no time yet
2015-12-08 22:01:51 -08:00
FalseIncarnate
6dfbd8f260 Claw Games!
Adds claw games, the absolute most-infuriating arcade game known to
mankind.
- Uses new fancy HTML5 / Javascript code stuff
- Is buildable!
- Science can produce the board with programming 2
- Requires a matter bin, manipulator, some cables, and a sheet of glass
- Costs money!
- Accepts cash or ID swipes, 15 credits per play token
- Dispenses prizeballs!
- Open them for a random plushie, carp plushie, or action figure!
- Two sets of sprites, thanks to FoS and Stephanov

Notes for the coders / future:
This provides a basic example for introducing new HTML5 / Javascript
arcade games, as well as a base type machine to use for such games.
While this may seem silly, this proves that we are not doom to have to
tolerate only the battle game and Orion Trail forever, and can even make
our own games for the arcade.
2015-12-09 00:37:30 -05:00
Fox-McCloud
34425c71f7 salt petre and holywater 2015-12-09 00:00:22 -05:00
TheDZD
23b405a905 Merge pull request #2777 from RudiPardieck/grammar-fix
Fixes mistakes with using /improper instead of \improper
2015-12-08 22:01:25 -05:00
Fox McCloud
a86d6121f8 Merge pull request #2753 from orelbon/Laser-Gun
Changes Laser gun energy consumption
2015-12-08 22:00:01 -05:00
TheDZD
a541d11913 Merge pull request #2448 from tigercat2000/footsteps_are_good_iunno
Footstep sounds
2015-12-08 20:37:49 -05:00
scrubmcnoob
2cb73bf143 Maintenance Drone Vent Crawling
Allows Maintenance Drones to vent crawl around the station. 
Made a suggestion on the forums a while back and everyone was fine with it, it was a matter of finding some one to do it.
I finally went through the code and found the correct code for this change.
2015-12-08 20:04:48 -05:00
Crazylemon64
289d54661c Roboconsole gives loc and health, Drones now flash right
- Adds health and location readings to the robot control console

- Drones now update status effects, so that flashes don't last forever
2015-12-08 14:29:56 -08:00
Crazylemon64
7efa8ed13f Sheet handling is much nicer now
- Nanotrasen fabrication machinery, such as those for space pods and
  exosuits, now have functional ID locks for their respective departments

- Research machinery and the fabricators now allow you to eject a custom
  amount of sheets, so you don't have to spam-click

- Splitting sheets by hand is now done by prompt
2015-12-08 14:23:48 -08:00
Fox-McCloud
c7073e52b8 glowcaps 2015-12-08 16:44:07 -05:00
Fox McCloud
f71c68739a Merge pull request #2764 from Crazylemon64/corgi_munch_fix
Corgis and mice will now heal when eating
2015-12-08 13:50:20 -05:00
Crazylemon
97f2f91843 Adds handiness to stack ejection
Also should make the mech fabricator actually require robotics access as
the file would suggest. Here goes nothing
2015-12-08 10:47:32 -08:00
Fox-McCloud
cf42d3b037 Re-Adds Weapon Based Nettles 2015-12-08 07:24:43 -05:00
Certh
d665bb0729 Fixes mistakes with using /improper instead of \improper 2015-12-08 10:37:42 +01:00
FalseIncarnate
4afec741fd Claw Game progress 2
Claw game is now playable from within SS13

- still need to code and test win-functionality
- still need to code prize ball and circuit board
2015-12-07 23:28:02 -05:00
TheDZD
2c4549d7ac Revert "Make color dialogs appear with current color."
This reverts commit af94d1bf6f.
2015-12-07 21:25:42 -05:00
Fox McCloud
45575ad3e9 Merge pull request #2762 from RudiPardieck/blood
Blood examine fixes
2015-12-07 19:27:33 -05:00
Crazylemon
438f6d9a8c Corgis and mice will now heal when eating
As things stood, they just modified the current registered value of
health, which would immediately be recalculate. This makes this less
stupid.
2015-12-07 09:42:12 -08:00
Certh
591daf04d2 Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).
Also corrected some periods, spelling errors etc. along the way.

If this PR seems familiar, a part of this is of an earlier PR that I messed up.
2015-12-07 16:14:26 +01:00
Certh
1c3012edd7 - Oil-covered clothing no longer shows as blood when examining a player
- Examining now also shows any bloody/oily feet when not wearing shoes
2015-12-07 14:31:07 +01:00
Certh
6e2288fbb8 bugfixed writing in blood 2015-12-07 14:11:58 +01:00
Fox McCloud
61c0cd1373 Merge pull request #2733 from Aurorablade/PEwPewPEw
More Guardian Tweaks and FUN removal
2015-12-07 01:03:22 -05:00
Fox McCloud
3fad5ca991 Merge pull request #2742 from ZomgPonies/blood
exotic blood changes
2015-12-07 01:03:06 -05:00
Aurorablade
39cc526e46 SSHOVE THIS IN YOUR FACE TRAVIS 2015-12-07 00:01:34 -05:00
TheDZD
0f7bf4a4b4 Merge pull request #2749 from Crazylemon64/cyborg_debugging
Cyborgs only die once when dead, and don't break binary talk
2015-12-06 16:01:00 -05:00
TheDZD
c3b52b2506 Merge pull request #2736 from Crazylemon64/odysseus_resistance
Resist to escape an odysseus' sleeper
2015-12-06 15:59:08 -05:00
TheDZD
5ae02c68bf Merge pull request #2735 from Crazylemon64/robo_surgery_fix
Some fixes to robotics surgery
2015-12-06 15:58:41 -05:00
Crazylemon
6265c8e6c1 DEATH TO THE RELATIVE PATHING SCUM 2015-12-06 10:25:48 -08:00
Crazylemon
8f52b540c7 robot/updatehealth now factors in oxyloss 2015-12-06 09:58:43 -08:00
orelbon
c931c9f6be Changes Laser gun energy consumption 2015-12-06 12:51:34 -05:00
Crazylemon64
38862b1437 Cyborgs only die once when dead, and don't break binary talk 2015-12-06 00:39:40 -08:00
Crazylemon64
bdb1c34a8e Intensive care can now rescue dethrall malpractice 2015-12-06 00:21:33 -08:00
Crazylemon64
6fed7d7648 Somewhat desnowflaked resistance 2015-12-06 00:17:25 -08:00
Aurorablade
5698509581 Heal Delay 2015-12-06 02:38:31 -05:00
Aurorablade
ee607af47e Adds small delay to healer heal clicking. 2015-12-06 02:33:30 -05:00
FalseIncarnate
bc5faea093 Claw Game progress
Errors resulting from Prize.js currently.

- still using the original images, need to switch those out
- need to remove unneeded code/commented attempts
- need to code win-functionality (close game, give prize)
- need to code in prize orbs, arcade circuit items
2015-12-06 02:26:12 -05:00