Commit Graph

7311 Commits

Author SHA1 Message Date
Cheridan bb9c09df46 Obsoletes flags = FPRINT | TABLEPASS*
*TABLEPASS was already totally obsolete.
FPRINT was used, but it was on virtually everything anyway.

Removes those flags from every instance where they were used. Also assigned and removed other flags where it made sense.

If it is desired, I can revive the flag as NOFPRINT, which would retain the original functionality, though inverted. That way it would be be used only  where it was intentional (holodeck items could use this for example).
2013-12-30 15:03:17 -06:00
Aranclanos d5ddac3a00 Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix
Cyber limbs fixes [FIXES #1920] + [Fixes #2180] + [RUNTIME FIX]
2013-12-30 10:23:54 -08:00
Cheridan f1fb63d5e2 Merge pull request #2160 from Cluwnes/werequire1sample
We require at least 1 sample of compatible DNA.
2013-12-30 10:15:25 -08:00
Robson Richards 6397796058 Removes a Check by Aran's request 2013-12-30 17:31:39 +00:00
Cluwnes Honk 6a03480976 More adjustments
Raises the genome cap for absorb objectives by 1, making objectives range from 6-8 genomes. Also adds a message explaining your starting one genome.
2013-12-29 15:37:40 -08:00
Aranclanos a5571508d0 Merge pull request #2049 from Incoming5643/wands3
Magic Mania: Sprites, Fixes, Balancing, and Mini-Features
2013-12-29 11:47:59 -08:00
Incoming 47ba33c50c Removes a pair of well meaning but apparently poorly realized code fixes for edge cases. 2013-12-29 13:46:29 -05:00
Robson Richards d3d4c79946 Merges Heal_Damage and Heal_robotic_damage procs
like I should have done in the first place.
Corrects all usages of Heal_damage so it works with the changed version.
Same goes for Heal_robotic_damage
2013-12-29 17:40:12 +00:00
Rockdtben 89006319dc Merge pull request #2179 from fleure/vending
Toggling vending machine's voice now works
2013-12-29 08:14:06 -08:00
Robson Richards 53bfd06609 Fixes #2180 - Augmented limb healing issues 2013-12-29 16:12:32 +00:00
fleure 0b299990e5 Also machines actually vend now! 2013-12-29 16:08:05 +00:00
Rockdtben 92636bbe01 Merge pull request #2168 from fleure/toolbox
Fixed toolbox parent object giving error
2013-12-29 08:00:11 -08:00
Rockdtben 87c4937558 Merge pull request #2169 from fleure/paper
Fixes paper with no input looking populated
2013-12-29 07:58:59 -08:00
fleure 2f2fc92742 Toggling vending machine's voice now works 2013-12-29 13:50:35 +00:00
Giacom 047b7ee9ff Merge pull request #2158 from Cluwnes/ninjutsu
Makes ninja gloves heat resistant.
2013-12-29 02:58:49 -08:00
Giacom 71aa7d0857 Merge pull request #2157 from Cluwnes/pocketcards
Makes cards pocketable.
2013-12-29 02:58:28 -08:00
Giacom 46a6830dec Merge pull request #2148 from ACCount12/master
Space Retrovirus fix
2013-12-29 02:57:39 -08:00
Cluwnes Honk b49604a485 Ups the genome requirement objectives by one to prevent ling ezwin with 5 genome objectives 2013-12-29 02:54:42 -08:00
Incoming 093d9b386d Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3 2013-12-29 02:20:09 -05:00
Aranclanos e06e9ffa4c Merge pull request #2047 from Miauw62/condimentpacks
Condiment packs: The Condipacking
2013-12-28 21:16:43 -08:00
Robson Richards 08ec9df967 Fixes it for Nonhuman mobs. 2013-12-29 02:25:12 +00:00
Robson Richards 819bb9451d <3 Aranclanos, You always know what's best. 2013-12-29 00:52:13 +00:00
Robson Richards 889b9c66f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into Toxic_converter_Fix 2013-12-29 00:40:24 +00:00
Aranclanos f6aae4898e Merge pull request #2159 from Cluwnes/succes
Succesful fixes
2013-12-28 16:17:03 -08:00
Aranclanos 66fdd58424 Merge pull request #2161 from Cluwnes/gaslogging
Adds ckey logging to canisters
2013-12-28 16:10:52 -08:00
fleure b07bca861f Fixes paper with no input looking populated 2013-12-28 16:30:50 +00:00
fleure 171147b1bf Fixed toolbox parent object giving error 2013-12-28 14:51:35 +00:00
Cheridan 22060e18d4 Merge pull request #2133 from Giacom/labor_tweaks
Labor Camp Tweaks #2
2013-12-27 22:15:51 -08:00
Cheridan 648fe11dd6 Merge pull request #2070 from Miauw62/digivalves
Digital valves can now be made and unwrenched. Fixes pipe fitting names.
2013-12-27 18:14:46 -08:00
Cluwnes Honk 71dc46d4cd Adds ckey logging to canisters
Lets admins see the ckey as well as the name of those who toggle release valves on canisters.
2013-12-27 16:46:00 -08:00
Cluwnes Honk 27c347661d We require at least 1 sample of compatible DNA.
Fixes not having DNA to use powers like stasis.
2013-12-27 16:02:56 -08:00
Cluwnes Honk 2482fd0702 Makes cards pocketable.
Adds w_classes to cards so you can actually pocket the things.
2013-12-27 15:49:21 -08:00
Cluwnes Honk dec6e4cd89 Makes ninja gloves heat resistant.
Ninjas will no longer burn their hands on mere lights.
2013-12-27 15:45:27 -08:00
Cluwnes Honk a8eeb943cd Succesful fixes
Fixes instances of "succesful" and "succesfully".
2013-12-27 15:40:01 -08:00
Incoming 392c6d51a9 Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3 2013-12-27 02:33:47 -05:00
Cheridan b9efeaa932 Merge pull request #2014 from kyrahabattoir/ItemNameFixingRound3
Item name fixing round3
2013-12-26 23:14:15 -08:00
Cheridan 7c2fbba76f Merge pull request #2111 from Perakp/voiceChangerFix
Voicechanger fix
2013-12-26 22:06:38 -08:00
Incoming 26a1bb65f2 Merge branch 'master' of https://github.com/tgstation/-tg-station into wands3
Conflicts:
	code/modules/mob/death.dm
	code/modules/mob/living/carbon/alien/death.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/human/death.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/silicon/death.dm
	code/modules/mob/living/silicon/robot/death.dm
2013-12-27 00:55:44 -05:00
ACCount 15ef414627 Viral fix
Fixed strain_data, removed some unused code.
2013-12-27 17:43:26 +12:00
Cheridan aeec1c0add Merge pull request #2116 from Giacom/sleeper_fix
You can now move out of sleepers by moving.
2013-12-26 21:36:30 -08:00
Cheridan f36a7d764c Merge pull request #2110 from Perakp/mimeSpells
Changes mime abilities into spells
2013-12-26 20:56:40 -08:00
Cheridan 4f144e0111 Merge pull request #2130 from Giacom/gib_refactor
Refactored gib() and dust()
2013-12-26 20:34:50 -08:00
Cheridan ef25332511 Merge pull request #2125 from Miauw62/ifitfeelsright
Folding boxes updates sprites properly
2013-12-26 20:13:09 -08:00
Cheridan 013b0a94f7 Merge pull request #2121 from Miauw62/firealarms
You can no longer farm infinite fire alarm electronics.
2013-12-26 19:50:26 -08:00
Cheridan 1f3eb1de27 Merge pull request #2124 from Miauw62/shootforthestars
Fingerprints, span classes and text path fixes.
2013-12-26 19:42:05 -08:00
Cheridan 717b5879bb Merge pull request #2120 from Miauw62/vivaladevolution
Fixed #1830 Monkeys now have a resist button on their HUD.
2013-12-26 19:33:55 -08:00
Cheridan 5d715da882 Merge pull request #2113 from Giacom/can_inject
[MAP] Syringe gun projectiles will now display a message when the shots are deflected by the THICKMATERIAL flag.
2013-12-24 00:27:21 -08:00
Cheridan ea45eee62a Merge pull request #2114 from Aranclanos/Linda2fast
The speed variable of Linda now is a lot prettier.
2013-12-23 14:57:54 -08:00
Giacomand 02a1e9bd0f * Increased the amount of iron that spawns in the labor camp.
* Decreased the amount of points you get from diamond and bananium. Increased the amount of points you get from Iron and alloys.
 * You can now see which minerals give you which points from the claiming console.
2013-12-23 22:26:36 +00:00
Giacomand 375b9f08ea Fixes the flags of the beret. 2013-12-23 21:58:20 +00:00