Commit Graph

19274 Commits

Author SHA1 Message Date
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
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
Fox-McCloud
34425c71f7 salt petre and holywater 2015-12-09 00:00:22 -05:00
Fox McCloud
b0be9925d3 Merge pull request #2780 from RudiPardieck/deflation
bugfix: inflatable doors no longer disappear when deflating non-viole…
2015-12-08 22:03:02 -05:00
Fox McCloud
4747def5e3 Merge pull request #2774 from Tastyfish/camera_pipes
Fixed pipes being captured by photo cameras
2015-12-08 22:01:33 -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
TheDZD
7439df2835 Merge pull request #2772 from Fox-McCloud/slot-machine-refactor
Slot Machine Refactor
2015-12-08 22:00:54 -05:00
TheDZD
55e0ac4507 Merge pull request #2770 from Fox-McCloud/bacpacks-and-stuff
Backpack Fixes and Port
2015-12-08 22:00:50 -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
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
Certh
522a7b7ac5 bugfix: inflatable doors no longer disappear when deflating non-violently 2015-12-08 16:45:27 +01: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
Tastyfish
6597b1012c Fixed pipes being captured by photo cameras 2015-12-08 02:06:20 -05:00
Fox-McCloud
87f6ccb61c visible message and jackpot 2015-12-07 22:40:10 -05:00
Fox-McCloud
7c6aa94e21 Slot Machine Refactor 2015-12-07 21:47:58 -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
Fox-McCloud
00800803ff Backpack Fixes and Port 2015-12-07 19:11:24 -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
6bdad2a9d9 The examine line of the safe was broken due to w_class being above 5. Tuned it down to 5 (huge item) 2015-12-07 16:33:44 +01: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
b8db2dd78d Merge pull request #2682 from Aurorablade/ScreenObjs
Screen object cleanup
2015-12-07 01:14:39 -05: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
5984e9049f Merge pull request #2752 from RudiPardieck/master
Fixes issues with two handed weapon sprites
2015-12-06 16:00:17 -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
TheDZD
58f67361e1 Merge pull request #2750 from Crazylemon64/medical_migraine_removal
Fixes the dumb I made with the DNA machine
2015-12-06 11:55:18 -05:00
Certh
fc3d211aa2 Fixes issues with two handed weapon sprites 2015-12-06 17:15:27 +01: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
63e0eed2f2 Fixes a major dumb I made in my last commit 2015-12-06 00:20:14 -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
Fox McCloud
bd6af05df4 Merge pull request #2745 from IAmBigCoat/recordsFix
Fixed num2hex for large numbers.
2015-12-06 02:13:52 -05:00
Fox McCloud
b92919f585 Merge pull request #2732 from Crazylemon64/posibrain_mind_fix
Posibrains have their mind cleared, so that no badness happens
2015-12-05 21:51:55 -05:00
Fox McCloud
b0675ca432 Merge pull request #2737 from Crazylemon64/medical_migraine_removal
Pull no longer works bad with medical machines
2015-12-05 21:51:01 -05:00
IAmBigCoat
3b783a9cb2 Fixed num2hex for large numbers.
ID numbers are larger than the bitwise operators allow, which gave everyone one of about sixteen ID #s.
Not sure what or if this actually fixes anything mechanically, but ID #s are pretty again.
2015-12-05 21:43:20 -05:00
TheDZD
cf9f6e08fc Merge pull request #2744 from Fox-McCloud/record-fix
Fixes Records
2015-12-05 21:40:44 -05:00