Commit Graph

11580 Commits

Author SHA1 Message Date
TheDZD
ff68ddbf55 Merge pull request #2822 from Fox-McCloud/fixup
Cell Weight Class and Tech Fixup
2015-12-14 19:10:41 -05:00
Tastyfish
2554939e38 fixed bee icon_states 2015-12-14 07:17:16 -05:00
Tigercat2000
a4ac9385ed Emergency patch, fixes asset_cache interfering with verbs 2015-12-13 21:09:48 -08:00
Fox McCloud
ca768e5fa2 Merge pull request #2824 from tigercat2000/I_am_fucking_mental
/vg/ / -tg- asset_cache
2015-12-13 01:29:34 -05:00
Tigercat2000
3d71483372 /vg/ / -tg- asset_cache
Port of -tg-'s port of /vg/'s asset cache
Funny thing is, this actually replaces an old version of /vg/'s asset
cache we already had
IT'S A PORT OF A PORT REPLACING A PORT
POOOOOOOOOOOOOORTCEPTION

Basically, gets rid of the 30-40 second interface lag when you first join,
via *mumblemumble* MAGIC!

Also moves a few nano files around.
2015-12-12 21:25:04 -08:00
TheDZD
3986cbe698 Merge pull request #2813 from Fox-McCloud/antihol-fix
Reagent Fixes and Tweaks
2015-12-12 23:28:47 -05:00
Fox-McCloud
a2d10c4c49 Cell Weight Class and Tech Fixup 2015-12-12 22:40:02 -05:00
TheDZD
a0d2942433 Merge pull request #2821 from Fox-McCloud/spacepod-fix
Spacepods Whyyyy
2015-12-12 19:11:53 -05:00
Fox-McCloud
a7fc7f1176 Spacepods Whyyyy 2015-12-12 18:37:40 -05:00
TheDZD
bc90f7e380 Merge pull request #2807 from Fox-McCloud/mining-update
TG Mining update Part II
2015-12-12 18:29:19 -05:00
TheDZD
f47f1c046f Merge pull request #2814 from Fox-McCloud/character-setup-fix
Fixes Character Setup UI
2015-12-12 18:26:15 -05:00
Fox-McCloud
5d1e24bc53 tweaks 2015-12-12 18:03:37 -05:00
Fox-McCloud
b84f31ac5c painkiller tweak 2015-12-12 16:51:37 -05:00
Fox McCloud
24fca10b44 Merge pull request #2817 from FalseIncarnate/master
Claw Game Fix 2
2015-12-12 03:07:54 -05:00
Fox-McCloud
1d6f5e07ad rezadone tweak 2015-12-12 02:27:22 -05:00
FalseIncarnate
f6c4ab53b2 Claw Game Fix 2
People like having multiple claw games, who knew?
- Fixes the issue of claw games not closing when multiple are present
2015-12-12 01:22:39 -05:00
Fox-McCloud
829a355c31 Fixes Character Setup UI 2015-12-11 23:25:45 -05:00
Fox-McCloud
dbeb31cd88 Fixes Antihol 2015-12-11 23:07:00 -05:00
Fox McCloud
98c069a8d6 Merge pull request #2803 from Tastyfish/money-laundering-with-a-stolen-id
Made slot machine have reactive ui, use bank correctly
2015-12-11 22:03:30 -05:00
Fox-McCloud
b7b9bdf66d drone cubes 2015-12-11 21:21:00 -05:00
Fox-McCloud
2c3bf2227e gar mesons 2015-12-10 23:34:17 -05:00
Fox-McCloud
068bfd10ba TG Mining Update 2015-12-10 21:35:02 -05:00
Tastyfish
88b933e8a0 Made slot machine have reactive ui, use bank correctly 2015-12-10 17:35:32 -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