Commit Graph

6604 Commits

Author SHA1 Message Date
hornygranny
71efbeef26 Merge pull request #5213 from Miauw62/whatthefuckareyouevensupposedtocallthesebranchesffs
Fixes whisper formatting hopefully maybe.
2014-11-08 15:12:59 -08:00
hornygranny
d15a44ca94 Merge pull request #5722 from Aranclanos/mechfabricators
Exosuit fabricator revamp
2014-11-08 15:10:58 -08:00
hornygranny
3f979d3aa1 Merge pull request #5695 from Aranclanos/lelerrocode
more VV logging and mass-modify proper admin-rights
2014-11-08 15:09:21 -08:00
hornygranny
d0d6947dad Merge pull request #5719 from MrPerson/pls_dont_make_fun_of_the_singulo_shes_not_fat_just_big_boned
Singularity tweaks
2014-11-08 15:08:40 -08:00
hornygranny
28592a230e Merge pull request #5737 from phil235/GrabbyPunchyFix
Adding a NOBLUDGEON check to simple_animal/attackby()
2014-11-08 15:07:18 -08:00
Swag McYolosteinen
8adfff35af Merge pull request #5732 from phil235/DisposalConstructionRuntimeFix
Fix Disposal pipe construction runtime.
2014-11-08 09:31:52 +01:00
Cheridan
53bf024dbe Merge pull request #5545 from RemieRichards/DiseaseRework
Disease Code Partial Rework
2014-11-08 00:17:47 -06:00
Cheridan
a9d1963eb6 Merge pull request #5723 from Aranclanos/hideclown
Hiding the jumpsuit with HIDEJUMPSUIT exosuits
2014-11-07 23:58:33 -06:00
Cheridan
e49e4efe29 Merge pull request #5704 from phil235/TypoFix1
Fixes the ability to beat up a pAI.
2014-11-07 23:52:31 -06:00
Cheridan
9721c6fb6f Merge pull request #5724 from Aranclanos/suicidestuff
Reworked a bit the suicide verb
2014-11-07 23:47:15 -06:00
hornygranny
efb3877fcf Merge pull request #5682 from paprka/fixdefib
Defibrillator Hotfixes
2014-11-07 19:49:04 -08:00
Remie Richards
e84beec0e2 more conflict fixes. 2014-11-08 01:22:27 +00:00
Remie Richards
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
Cheridan
7974b77dfa Merge pull request #5703 from phil235/AttackHandFix
Less copypasta in mob attack procs
2014-11-07 18:06:45 -06:00
phil235
2d04cbc39c Fixing the merge conflicts. 2014-11-07 22:31:26 +01:00
phil235
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
Cheridan
b1a23de3da Merge pull request #5696 from Aranclanos/gibber
Resist out of a gibber fix
2014-11-07 14:29:49 -06:00
Cheridan
594fd9d3e2 Merge pull request #5271 from Menshin/html_sanitization
Text input sanitization (take 1)
2014-11-07 13:56:20 -06:00
Cheridan
7f3040f708 Merge pull request #5697 from Aranclanos/AIemotes
AI emotes
2014-11-07 13:49:09 -06:00
phil235
8d0afc77fc Adding a NOBLUDGEON check to simple_animal/attackby() so you can't hit them with NOBLUDGEON items like grabs or goliath_hide. 2014-11-07 19:59:01 +01:00
hornygranny
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
Remie Richards
0914b1a7cd Merge pull request #5642 from phil235/AttackAnimation
Adding an attack animation to most attacks
2014-11-07 18:39:27 +00:00
Cheridan
fc6358877f Merge pull request #5698 from Aranclanos/overrideadminnotice
World message removal, admin panel override.
2014-11-07 10:31:38 -06:00
phil235
aa9873d7ff Fix Disposal pipe construction runtime. 2014-11-07 17:12:16 +01:00
phil235
bc5754b378 adding diagonal attack animation. 2014-11-07 15:42:07 +01:00
Aranclanos
d56698f991 Exosuit fabricator revamp
Exosuits will now use the designs from RnD to create objects instead of having the object already created on their contents.
Each one of the default items to build are now designs.
Removed access required to use the exosuit fabricators.
Removed an unused mech syringe gun design and replaced with a new one, with no cost.
Added a temporal object, /obj/item/mechavars, to be able to use initalize() for the construction time. This will be later on removed and the construction time will be ported to the design datums.
Some minors issues are still present, due to the amount of files needed to fix these, it won't be part of this commit, but a future one.
Fixes issue #3893
Removed required access to access the setting controls of the RnD console.
2014-11-06 23:45:16 -03:00
MrPerson
deb5884a19 Singularity tweaks
Fix an off-by-one error that caused the singulo to get stuck along contaiment fields. For a 5x5 singulo, it would check 6 squares ahead (correct for a step forward) and then 6 squares to the sides (incorrect). Now it tests 6 squares ahead, 5 to the sides. This is technically wrong for the growth checks but they check every direction anyways, so it's ok.
Made the singularity drift in all cases and not stop next to lattices.
In process(), moved the growth checks after the movement attempt so it will take a step and then grow rather than take a step, drift into the walls, and then attempt and fail to grow as part of the next process().
2014-11-06 16:41:21 -08:00
Remie Richards
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
Remie Richards
7cae2b3bc7 Merge pull request #5678 from Aranclanos/disposalchutes
Mechas in disposals fix
2014-11-06 21:57:41 +00:00
Aranclanos
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
phil235
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
Aranclanos
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
phil235
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
phil235
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
MrStonedOne
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
phil235
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
Aranclanos
a8dc2711ce Swapped the admin panel override alert message from all players to only asay. 2014-11-05 18:16:05 -03:00
Aranclanos
5d47ebc35c Made the cyborg emotes be instead for all silicons
Fixes issue #3866
2014-11-05 18:12:11 -03:00
Aranclanos
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
Aranclanos
957c4d3f7c Small works with VV:
Fixes issues with skipping admin rights with mass modify when editing icons.
Added a check for mass-edit of ckeys, no admin can mass-modify them now.
Added logs for list values modifications, additions and deletions.
Fixes issue #3840
2014-11-05 17:34:33 -03:00
Cheridan
ccfe8e41bf Merge pull request #5647 from Miauw62/halloweenfixes
Makes spookoween things a bit nicer.
2014-11-05 14:17:14 -06:00
phil235
dfbe73e80a Added attack logs where missing.
Moving attack_alien for silicons to silicon/attack_alien() with overrides in children.
Fixing messages.

Attack_animal for silicons: all in silicon/attack_animal()

Attack_slime handled in living, overriden in its children.
Simplified the definition of the stunprob var, slight nerf to slime shock.
2014-11-05 20:37:14 +01:00
phil235
09984d5ee0 ATTACK_HAND in aliens:
Moving attack_hand for larva+humanoid to alien/attack_hand() in alien_defense to handle both.
Changing weaken() to paralyze() in alien/attack_hand() in hulk and disarm section because weaken fails on aliens.
lowered alien bite damage on alien to just 1 in all cases, instead of rand(1,3) for humanoid->humanoid.
Added alien/attack_hand() to handle both larva and humanoid, with override in the children.
Adding a death message for the larva.

Attack_paw for aliens: handled in alien/attack_paw() and overridden in children.

Attack_animal for aliens: handled in alien/attack_animal() in alien_defense.dm

Added attack logs where missing.
2014-11-05 18:54:54 +01:00
phil235
ea1daa40d5 moved attack_slime to carbon/alien to handle both larva and humanoid, with a little override in larva and humanoid.
Created proc/grabbedby in mob/living/living_defense.dm to handle all grab stuff in the attack_hand's and attack_alien's.
Fixed typos in messages.
one attack_larva gets a return attack_alien for its harm part.
Fixing larva attack on larva, couldn't help a fellow larva.
moving humanoid/attack_larva to alien/attack_larva() to handle both humanoid and larva being attacked by larva.
Fix a bug with attack_slime where you could glomp a dead humanoid indefinitely.
2014-11-05 17:42:40 +01:00
phil235
20e90d1168 Fixes typos in message and icon. Fixes the ability to beat up a pAI. Adds a cooldown to attack_animal on mechs. 2014-11-05 14:45:47 +01:00
JJRcop
bfc62a78aa Changes the defibrillator to use HEALTH_THRESHOLD_DEAD as the max damage it heals
Changes succumb to apply exactly the required amount of oxyloss to die, instead of a hard-coded 200
2014-11-04 23:48:57 -05:00
Aranclanos
0e2176c7a0 Added a new proc for movable atoms, disposalEnterTry(). It will be used by disposal chutes to check if the object who bumped them can enter or not.
As for the moment, mechas and projectiles will fail.
2014-11-04 17:23:02 -03:00
phil235
1bf2574091 M not H. derp 2014-11-04 20:34:44 +01:00
phil235
48ad48acce Add a fail message to unbuckling, breaking out of cuffs and closets and performing CPR. 2014-11-04 20:30:04 +01:00
Menshin
b77e2fc46a Conflicts solving 2014-11-04 20:24:52 +01:00