53bf024dbe
Merge pull request #5545 from RemieRichards/DiseaseRework
...
Disease Code Partial Rework
2014-11-08 00:17:47 -06:00
3731747d11
Remembers to remove code/datums/disease.dm , code/datums/disease/_disease.dm replace it.
2014-11-08 06:12:22 +00:00
a9d1963eb6
Merge pull request #5723 from Aranclanos/hideclown
...
Hiding the jumpsuit with HIDEJUMPSUIT exosuits
2014-11-07 23:58:33 -06:00
e49e4efe29
Merge pull request #5704 from phil235/TypoFix1
...
Fixes the ability to beat up a pAI.
2014-11-07 23:52:31 -06:00
78e73986d4
Merge pull request #5714 from phil235/WindoorFireballFix
...
Adding an ex_act() proc to windoors
2014-11-07 23:49:47 -06:00
9721c6fb6f
Merge pull request #5724 from Aranclanos/suicidestuff
...
Reworked a bit the suicide verb
2014-11-07 23:47:15 -06:00
15b16e1f67
Merge pull request #5726 from paprka/traitorbeltthing
...
Adds disguised med analyzer to medibelts
2014-11-07 23:39:56 -06:00
efb3877fcf
Merge pull request #5682 from paprka/fixdefib
...
Defibrillator Hotfixes
2014-11-07 19:49:04 -08:00
3854ab4763
Merge pull request #5707 from Donkie/closetbudgefix
...
Fixed #3752 It won't budge!!!11
2014-11-07 20:08:38 -06:00
e84beec0e2
more conflict fixes.
2014-11-08 01:22:27 +00:00
2054cbda08
Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
...
Conflicts:
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/carbon/human/human_attackpaw.dm
code/modules/mob/living/carbon/monkey/monkey.dm
2014-11-08 01:07:29 +00:00
7bde69c3a7
emagged defibs now make people gasp
2014-11-07 16:17:58 -08:00
774e82de06
Buffed weaken of safety off defibs and removed burn damage
2014-11-07 16:17:11 -08:00
7974b77dfa
Merge pull request #5703 from phil235/AttackHandFix
...
Less copypasta in mob attack procs
2014-11-07 18:06:45 -06:00
2d04cbc39c
Fixing the merge conflicts.
2014-11-07 22:31:26 +01:00
1d96ef944d
Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackHandFix
...
Conflicts:
code/game/machinery/turrets.dm
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
code/modules/mob/living/carbon/alien/larva/larva.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackalien.dm
code/modules/mob/living/carbon/human/human_attackpaw.dm
code/modules/mob/living/carbon/monkey/monkey.dm
code/modules/mob/living/carbon/slime/slime.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/simple_animal/constructs.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2014-11-07 21:47:18 +01:00
b1a23de3da
Merge pull request #5696 from Aranclanos/gibber
...
Resist out of a gibber fix
2014-11-07 14:29:49 -06:00
594fd9d3e2
Merge pull request #5271 from Menshin/html_sanitization
...
Text input sanitization (take 1)
2014-11-07 13:56:20 -06:00
7f3040f708
Merge pull request #5697 from Aranclanos/AIemotes
...
AI emotes
2014-11-07 13:49:09 -06:00
5660895baf
Merge pull request #5677 from Aranclanos/tomecult
...
Cult rune restriction fix
2014-11-07 13:27:53 -06:00
8a329bac6f
Merge pull request #5699 from MrStonedOne/MutiTask
...
Fixes player panel only allowing one window to be open at a time.
2014-11-07 10:46:55 -08:00
0914b1a7cd
Merge pull request #5642 from phil235/AttackAnimation
...
Adding an attack animation to most attacks
2014-11-07 18:39:27 +00:00
fc6358877f
Merge pull request #5698 from Aranclanos/overrideadminnotice
...
World message removal, admin panel override.
2014-11-07 10:31:38 -06:00
e2bf3eca4b
Merge pull request #5705 from Donkie/batonfix
...
Fixes #5691 - Batons incorrectly giving messages
2014-11-07 10:27:09 -06:00
3f16a966b2
Merge pull request #5712 from xxalpha/amilli
...
Increases gold content per Robust Gold cigarette to 1
2014-11-07 10:09:54 -06:00
669a20df77
Merge pull request #5708 from paprka/stupidfuckup
...
Fixes utility medipen bundle for miners
2014-11-07 10:03:46 -06:00
bc5754b378
adding diagonal attack animation.
2014-11-07 15:42:07 +01:00
e5db75d756
adds disguised med analyzer to medibelts
2014-11-06 21:36:54 -08:00
c59e9ee20c
Merge pull request #5665 from phil235/CPRFailMsg
...
Add a fail message to unbuckling, breaking out of cuffs and closets and CPR.
2014-11-06 22:18:02 +00:00
b58a8322d8
Merge pull request #5661 from Jordie0608/howwouldthisevenworkirl
...
Fixes #5626 Null coloring runtime, auto-ejection
2014-11-06 21:59:20 +00:00
7cae2b3bc7
Merge pull request #5678 from Aranclanos/disposalchutes
...
Mechas in disposals fix
2014-11-06 21:57:41 +00:00
7da2f11565
Merge pull request #5694 from Aranclanos/assasinateMind
...
Assassinate objective with the wrong name fix
2014-11-06 21:56:57 +00:00
09e6825b5d
Merge pull request #5692 from Aranclanos/TKihateyou
...
Computers and telekinesis fix
2014-11-06 21:56:31 +00:00
1fd1bf0de9
Merge pull request #5684 from tkdrg/beepbeep
...
NTRC bugfixes
2014-11-06 21:55:03 +00:00
e4386534fa
Merge pull request #5683 from JJRcop/fix_#5656
...
Fixes #5656 Borgs can't pull
2014-11-06 21:53:14 +00:00
ed1898e4df
Uniform overlays will now be blocked from showing if the exosuit has the flag HIDEJUMPSUIT, preventing the own and clown suit from sticking out of spacesuit and others.
...
Fixes issue #3881
2014-11-06 18:16:17 -03:00
faeb2bb8d2
Adding an ex_act() proc to windoors so they are destroyable with fireballs. Removing some "text(...)" stuff.
2014-11-06 22:10:36 +01:00
e1a06faa9b
Increases gold content per Robust Gold cigarette to 1
2014-11-06 18:23:48 +00:00
e5dd72cb8e
Some absolute pathing fixed.
...
Fixing some mistakes and typos.
Fixes many attacks on simple animals not checking the force_threshold.(adding attack_threshold_check() )
2014-11-06 18:50:13 +01:00
ead9b2a8bb
Breathing won't check anymore if the person if committed suicide.
...
People will be able to perform several suicides if they survived previous ones.
The examine suicide text will only appear if the person is dead.
2014-11-06 13:48:41 -03:00
b99499e277
fixes utility medipen bundle for miners
2014-11-05 18:02:14 -08:00
13d955ed47
Fixed #3752
2014-11-06 01:55:57 +01:00
059244387f
Fixed #5691
2014-11-06 01:12:15 +01:00
1649883425
Fixed some typos.
...
Moved some attack procs from carbon.dm to carbon/carbon_defense.dm and from human.dm to human/human_defense.dm.
2014-11-06 00:52:31 +01:00
f908befb36
attack_alien() moved to living/attack_alien() and overridden in the children.
...
Adding missing attack logs.
Fixing some mistakes in attack_animal()'s
Attack_hand():
cyborg can now be grabbed
AI and cyborg can be punched, with damage only with hulk.
Rearranging the attack_hand() procs a bit.
Adding missing attack logs.
2014-11-06 00:32:19 +01:00
3b40d6a20d
Fixes inconsistencies with the player panel
...
Every other admin window that deals with singular things (vv, traitorpanel, etc) lets you have more then one open (as long as its not about the same thing), But not pp, the central point of all of them.
This fixes that and allows you have a window open for each mob.
2014-11-05 13:53:05 -08:00
2c54ea4f47
Attack_animal() is moved and handled in living/attack_animal() in living_defense.dm and overridden in children.
...
Maybe fixes the animal emote not working (Ian nuzzles, etc)
moving attack_paw to living and nerfing it by making prob(75) apply to all living not just monkeys.
Attack_larva() is moved to living/attack_larva
Adding larva rubbing on silicon
Adding possibility to fail to bite the living as larva.
Adding missing attack logs
2014-11-05 22:34:47 +01:00
a8dc2711ce
Swapped the admin panel override alert message from all players to only asay.
2014-11-05 18:16:05 -03:00
5d47ebc35c
Made the cyborg emotes be instead for all silicons
...
Fixes issue #3866
2014-11-05 18:12:11 -03:00
4ef6582b3a
The gibber will now react properly to a mob trying to escape from it, even if the mob isn't the 'occupant'. It can happen if the mob changes to another one, like a changeling.
...
New machinery proc, dropContents, it's basically a chunk of open_machine()
2014-11-05 18:02:43 -03:00
Cheridan
Remie Richards
hornygranny
paprka
phil235
Aranclanos
xxalpha
Daniel
MrStonedOne