Commit Graph

4181 Commits

Author SHA1 Message Date
fleure 8660698ce0 Merge pull request #2444 from Miauw62/somebodyfinallydoessomethingaboutnewlingsuckingpleaselickmyfeetnow
Adds changeling arm blades
2014-01-24 12:49:05 -08:00
fleure 5a4441831e Merge pull request #2473 from Giacom/reagent_mix_alpha
Reagents can now mix their alpha color.
2014-01-24 11:53:42 -08:00
fleure 277a33c184 Merge pull request #2482 from Tenebrosity/throwsounds
Thrown objects play throwhitsound
2014-01-24 11:37:06 -08:00
fleure e8573cc416 Merge pull request #2373 from RobRichards1997/14/01/2014-Bug-Fixes
Robotic Repair Missing fixes [Fixes #2326]
2014-01-24 11:17:54 -08:00
fleure 7abb6d1af4 Merge pull request #2484 from Giacom/bloody_hands_so_real
You can now properly clean your hands of blood. Fixes #2258.
2014-01-24 11:15:32 -08:00
Tenebrosity e4739afc44 Item throwtapsound var for forceless objects 2014-01-23 23:07:24 +13:00
Tenebrosity b77434b1cb Items now have a throwhitsound var
If throwhitsound isn't defined, a thrown item calls the hitsound
instead. If that isn't defined, no sound is played.

Circular saw now calls pierce.ogg as its throwhitsound instead of its
hitsound.
2014-01-23 16:37:54 +13:00
EuroNumbers 31d4f16e62 Fixes incompabilities of ban DB with Linux system
ALWAYS USE LOWERCASE
2014-01-22 23:58:57 +01:00
Giacomand 4b51e6d386 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/2371 2014-01-22 20:01:11 +00:00
Giacomand 6a497b98ad Added the SetEmagged proc, for cyborgs, and replaced code to use it.
Added get_inactive_modules and get_usable_modules procs to use while looping through the cyborg's modules.
The cyborg's storage screen will now shrink if there is an empty row.
Added a new on_emag proc for modules, which is called when the module is emagged. Miner borgs use it to replace their borg drill for a diamond one.
Fixes a runtime where there is no client to update the hud.
Fixes a bug where if you emag a cyborg with no module and when they choose a miner they do not receive their diamond drill.
2014-01-22 20:00:39 +00:00
Giacomand 86d4d5307a You can now properly clean your hands of blood. Fixes #2258.
When you touch an item, to spread the blood, it would take the "bloody_hands" to 0; which is checked if true while you wash your hands. I limited it to only go down to 1, so it will still be true unless you wash your hands.
Fixed an issue where blood_DNA was being cleared before the blood_hands variable was being set to 0. Now you can properly hide your bloody hands with gloves and when you take them off the hands will still be bloody.
Removed an unused variable.
Set the bloody_hands_mob to null where it was appropriate.
The amount of blood you can transfer to other items, when you touch them, will be a little random for variety.
Revive() will now heal your hallos damage.
2014-01-22 17:42:36 +00:00
Miauw 4bdffc2dc3 Merge branch 'master' of https://github.com/tgstation/-tg-station into somebodyfinallydoessomethingaboutnewlingsuckingpleaselickmyfeetnow
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-01-22 17:01:20 +01:00
Tenebrosity da8838d411 Throw impacts play the thrown object's hitsound 2014-01-23 02:29:39 +13:00
Cheridan 290180dec8 Merge pull request #2387 from MrPerson/Animation_OLD
Mobs use animate() to rotate
2014-01-21 20:39:12 -08:00
Cheridan b583b83608 Merge pull request #2466 from Incoming5643/slimetime
Slime refactoring fixes
2014-01-21 20:17:00 -08:00
Incoming eb8454006f Fixes dark purple, dark blue, and light pink slimes not working right because of their spaces 2014-01-21 20:00:30 -05:00
MrPerson 9058921972 Merge branch 'master' of https://github.com/tgstation/-tg-station into Animation_OLD
Conflicts:
	code/game/objects/items/weapons/shields.dm
	code/modules/events/ninja.dm
	code/modules/mob/living/carbon/human/update_icons.dm

No more cloakers, no more cloak_stacks. Also removed that silly "I'll make an icon and then make an image of that icon" bullshit.
2014-01-21 15:19:27 -08:00
Pete Goodfellow 9a8edff524 Merge fix. Updated to MetaStation.v39B.II.dmm 2014-01-21 21:57:10 +00:00
Pete Goodfellow d80719c330 Merge branch 'tg-mapchange' of github.com:Mloc/-tg-station into mapsss
Conflicts:
	_maps/RandomZLevels/fileList.txt
	_maps/map_files/MetaStation.v39A.III.dmm
	maps/MetaStation.v39A.III.dmm
	maps/MetaStation.v39B.II.dmm
	tgstation.dme
2014-01-21 21:50:32 +00:00
JJRcop 0e45022798 Resolved more conflicts with drying rack before being pulled
Conflicts:
	code/modules/hydroponics/seeds.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/hydroponics.dmi
Readded missing file changes to icons/obj/harvest.dmi
2014-01-21 13:01:53 -05:00
Giacomand f71cc6fde1 Reagents can now mix their alpha color.
Changed water to a grey very transparent colour, so real. This also means when you water down reagents you can see them becoming very transparent, extra real!
Changed the plasma reagent's colour to look a little better.
Changed the icon of the reagent filling overlays so that they didn't mess up the colours so much.
Added a new "invisible powder" reagent which you can get by grinding the mime's crayon, this powder has no colour and has no alpha.
2014-01-21 16:06:28 +00:00
Robson Richards 1ff14a5fcf Adds item_heal_robotic() - a way for items to trigger robotic limb heal procs without copy-paste 2014-01-21 07:38:46 +00:00
Incoming bb767ead76 Another minor fix to the slime refactor commit. Splitting adult slimes weren't surviving correctly. Revive to the rescue. 2014-01-20 23:08:59 -05:00
Cheridan e0680a509e Merge pull request #2449 from Razharas/SlimesAndWindows
Fixes metr-err- i mean slimes
2014-01-20 17:25:31 -08:00
Incoming a0752b8665 Fixes an oversight in slime reproduction 2014-01-20 18:20:12 -05:00
Pete Goodfellow e8ed1a83f7 Merge branch 'master' of github.com:tgstation/-tg-station into waistcoat2
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
2014-01-20 19:29:47 +00:00
fleure ad49512b4e Merge pull request #2440 from Petethegoat/suicideformat
Updated all suicide_act()s to use a new span class, 'suicide'.
2014-01-20 11:11:23 -08:00
fleure d6964e703d Merge pull request #2442 from Alek2ander/master
Logs, logs everywhere
2014-01-20 11:08:57 -08:00
fleure f3ca9c0c2c Merge pull request #2446 from Petethegoat/walkspeed
Speeds up walking from 7 delay to 4.
2014-01-20 10:54:36 -08:00
Pete Goodfellow a462177c8e Adjusts movement_delay() for aliens, to use inheritance!
Speeds up drones, they are now the same speed as sentinels.
2014-01-20 18:31:57 +00:00
fleure c73f6f7eec Merge pull request #2445 from Razharas/AbstractNonsense
Fixes the admin notice thingie
2014-01-20 10:27:47 -08:00
Cheridan 9cbb9bb403 Merge pull request #2434 from johnsmith38/master
Black Baseball Caps [FIXED]
2014-01-19 20:21:40 -08:00
Cheridan 70e5618cb0 Merge pull request #2375 from Giacom/remove_icon_operations_from_premises
[501] Refactored the code to remove most icon operations for changing an icon's colour.
2014-01-19 16:06:25 -08:00
Razharas 63e9192fe7 Fixes metr-err- i mean slimes
Fixes #225
2014-01-20 02:29:36 +04:00
Pete Goodfellow fd4df85045 Changed legcuffs to use slowdown instead of forcing the user to walk. 2014-01-19 20:17:23 +00:00
Pete Goodfellow 9df2455cfb Speeds up walking from 7 delay to 4. Removes the hardcoded walk/running delays, and uses the config options instead. 2014-01-19 19:44:11 +00:00
Miauw 3af2b7fe4a Ling arm blades can now be used in debraining surgery in the place of circular saws. 2014-01-19 19:08:08 +01:00
Razharas 2254ad4cb6 Fixes the admin notice thingie
Fixes #2427
2014-01-19 22:05:35 +04:00
Alek2ander 9fa38637ad Logs everywhere
Explosion game log now has epicenter coords
Powersink placement and explosion notifications
C4 notifications and logs
Logging singulo munchies and death
All SMES interactions now logged, because any of them can mess stuff up
Telesci logs what was teleported
2014-01-19 21:16:30 +04:00
Pete Goodfellow af4849ce72 Updated all suicide_act()s to use a new span class, 'suicide'. 2014-01-19 16:46:37 +00:00
Pete Goodfellow 5222191b73 Changes the waistcoat path from /obj/item/clothing/suit/wcoat to /obj/item/clothing/tie/wcoat so you can wear it under a spacesuit or suit jacket.
Also makes ties show up on the jumpsuit object.
2014-01-19 14:50:27 +00:00
fleure 05e96e477d Merge pull request #2424 from RobRichards1997/18/01/2014-Cyborg-Debraining
Fixes not being able to debrain augmented humans
2014-01-19 03:42:57 -08:00
John Smith a3e94d74e9 Black Baseball Caps [FIXED] 2014-01-19 00:35:10 -08:00
MrPerson adbb273221 Merge pull request #2419 from KazeEspada/goodbyespaceworms2014
removes space worms
2014-01-18 23:24:22 -08:00
fleure 41af5a264f Merge pull request #2414 from Razharas/BorgsMASTA!!--SPAAAAAAAAAAAAAAAKU!!
Fixes borgs sparking when hit with 0 damage items
2014-01-18 17:28:52 -08:00
fleure 65729c6500 Merge pull request #2418 from hornygranny/necrophilia
Animal necrophilia removed
2014-01-18 17:23:58 -08:00
MrPerson 5f1b76dd99 Lock aliens lying to 90 degrees.
Make them use the sleep sprites when unconscious.

Lock mobs laying down to either NORTH or SOUTH.
2014-01-18 13:41:43 -08:00
Giacom 3a77ff99f7 Merge pull request #2407 from hornygranny/chameleonfix
Chameleon jumpsuit fix
2014-01-18 12:29:44 -08:00
Cheridan b4f1e03341 Merge pull request #2285 from ChuckTheSheep/Botany
Irrigation Botany Changes
2014-01-18 12:12:38 -08:00
Robson Richards 0af17afec7 fixes not being able to debrain augmented humans 2014-01-18 12:26:00 +00:00