Commit Graph

77 Commits

Author SHA1 Message Date
Remie Richards 5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
tkdrg 6a0f1be7cd Merge pull request #6584 from phil235/HoloSwordFix
Fixes being able to smash grille/newscaster/mirror/lights with holo esword
2015-01-01 16:39:16 -03:00
phil235 4374e46cdd Fixes being able to smash grille/newscaster/mirror/lights with holo esword. 2014-12-24 23:50:20 +01:00
Razharas 9a27fe7c8d Conflict fix
Yeah makes it all work
2014-12-21 06:12:33 +03:00
phil235 d5a7d82959 Fixes a lot of "the the" in messages. 2014-12-16 22:59:55 +01:00
Razharas 0921aa201f Added datum mutations
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03:00
Cheridan d529235696 Merge pull request #6187 from phil235/GrilleWindowFix
Fixes being able to place multiple fulltile window on a grille.
2014-12-09 12:51:05 -06:00
Razharas 0b32dc97a7 Merge pull request #6136 from optimumtact/patch-3
Grille throwforce is now halved against grilles, instead of -5
2014-12-09 05:31:32 +03:00
Razharas 7758a0afed Ok now explosions shall work properly
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
2014-12-05 23:21:48 +03:00
phil235 3160ac56b1 Fixes being able to place multiple fulltile window on a grille.
Fixes being able to place a fulltile window on a grille with single dir windows.
Fixes a typo in grille message.
Grille now needs to be anchored to place a window on it.
2014-12-02 22:00:25 +01:00
Orange Borg 7015cb3f8d Remove the -5 throwforce against grilles, replaces with * 0.5
As per dicusssion on #6092 which Raz merged before I could add the change.

Max left in as a guard against -forces magically healing the grille.
2014-12-01 10:00:55 +13:00
hornygranny e7d862b248 Merge pull request #6119 from Intigracy/recursivebyebye
Removes recursive explosions
2014-11-28 16:33:30 -08:00
Razharas b3f79777c9 Merge pull request #6092 from optimumtact/patch-1
Stop items having a negative throw force against grilles
2014-11-28 15:16:59 +03:00
Intigracy 8a1baad03b forgot the var / proc 2014-11-27 14:50:21 -08:00
Orange Borg c9665d4b2f Stop items having a negative throw force against grilles
This prevents the grille from gaining health if you hit it with something less than 5 tforce
2014-11-27 12:07:55 +13:00
Razharas 3511e0dada Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
Conflicts:
	code/game/turfs/simulated/walls.dm

Ye somth liek dat
2014-11-23 17:46:14 +03:00
hornygranny dce9dadea2 Merge pull request #5914 from paprka/removewindows
Changes most border windows/firelocks to full tile
Gets paprika killed
2014-11-21 11:47:04 -08:00
Razharas afac70c4f7 Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour 2014-11-19 21:37:06 +03:00
Razharas ff456ebaf4 Unwinded most of shit
Meh
2014-11-19 21:36:45 +03:00
paprka fd910387c3 windows damage and such 2014-11-16 17:13:33 -08:00
paprka 706e03bd1b Full tile window placing on grilles 2014-11-16 14:29:39 -08:00
phil235 a005055cf3 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechAtkFix1
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
2014-11-13 17:17:23 +01:00
paprka 0ffba02112 Merge branch 'master' of https://github.com/tgstation/-tg-station into glasstables
Conflicts:
	_maps/map_files/MetaStation.v39K.dmm
	_maps/map_files/tgstation.2.1.3.dmm
	code/game/objects/structures/tables_racks.dm
2014-11-09 14:53:19 -08:00
phil235 9e487bb33a derp 2014-11-07 22:38:52 +01:00
Hornygranny c8ffcf51ae lattice and grille deconstruction refactor 2014-11-07 13:36:28 -08:00
phil235 8ac93c41db Merge branch 'master' of https://github.com/tgstation/-tg-station into MechAtkFix1
Conflicts:
	code/game/objects/structures/grille.dm
	code/game/turfs/simulated/walls.dm
2014-11-07 20:16:14 +01:00
phil235 bc5754b378 adding diagonal attack animation. 2014-11-07 15:42:07 +01:00
phil235 74f8a08522 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation
Conflicts:
	code/modules/mob/living/living.dm
2014-11-04 18:55:07 +01:00
phil235 1eaaf35b41 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechAtkFix1
Conflicts:
	code/game/objects/objs.dm
	code/modules/mob/living/carbon/human/human_defense.dm
2014-11-04 18:24:52 +01:00
paprka 28b1d8bef0 fixes grille rebuilding, removes damaging from tables, adds better sound effects for smashing tables, adds chance to fail breaking reinforced tables as hulk 2014-11-03 20:41:40 -08:00
phil235 9c11d9fa25 All mechs have a melee attack now, the force of non combat mechs is 5.
Changing the mech melee attack code to be more object oriented. Creating mech_melee_attack() proc for atom and overidden in its children.
Mechs can now hit windoors with their melee attack. (they can still open them by bumping)
2014-11-03 21:40:25 +01:00
phil235 1506383b2c Adding some missing do_attack_animation()
Moving do_attack_animation() proc to mob/living
Fixing the pixel offset issue from beds especially rollerbed.
Fixing the nograv bouncing stopping because of another animation being used.(lying down, jittering, attack animation)
2014-11-03 15:11:39 +01:00
phil235 3f30912c51 WIP - Adding attack animation to most attacks.
Fixing a couple "for(......) show_message()".
2014-11-02 22:50:58 +01:00
Hornygranny 5815d7e011 grilles are now damaged by thrown items
disposalpipes deconstruction
atmos pipes deconstruction
2014-10-31 18:26:42 -07:00
phil235 dbea503e88 Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere.
Fixing one instance of "for(mob in viewers) show_message()" to "visible_message()"
2014-10-15 18:03:06 +02:00
Jordie0608 cbdf479b5d hitsound uses burn else instead of checking brute 2014-09-18 20:05:46 +10:00
Jordie0608 d53e8f6a52 Merge branch 'master' of https://github.com/tgstation/-tg-station into breakingrillesisagreatwaytoruinabarbeque
Conflicts:
	code/game/objects/structures/grille.dm
2014-09-18 19:16:28 +10:00
Jordie0608 6e9eed33f7 Merge branch 'master' of https://github.com/tgstation/-tg-station into breakingrillesisagreatwaytoruinabarbeque 2014-09-16 12:50:12 +10:00
Jordie 73c5ef4459 == > != 2014-09-15 20:37:21 +10:00
Jordie 26a7aa1ec3 Updates grille damages 2014-09-15 20:12:14 +10:00
phil235 24686b5248 Fixes many messages/sounds or lack thereof for different mobs.
(

Nothing when Attack w/ item on dead animal
No varied attack verb for the above.
Item attack on alive SA/syndicate/melee: no sound
No Punchsound on alive and dead SA.
goat attack on SA/human/alien/monkey : no sound
attack_hand and Item attack on dying mouse: nothing
is_muzzled() fix in slime.dm and humanoid.dm and larva.dm and humanattac?kpaw.dm (put a muzzle on self, immune to monkey bites!)
monkey attack on animal: can't attack alive!
monkey (821) has attacked the grey baby slime (477)! (needs bite and sound)
monkey can't attack_paw alien/slime/animal with health below 0.
attack_animal on larva has no sound.
monkey bite on human: no sound
Larva on Humanoid/slime.
can't monkeybite a wounded alien.
larva needs to be attackable by humanoid/slime/hand/item/monkey/SA
Monkey cant bite dead/unconscious monkey
Larva bite has no sound. can't bite anyone but animals

)
2014-09-13 17:41:47 +02:00
phil235 d88cc00a2f Fixing some message and sound. 2014-09-13 00:46:57 +02:00
Lo6a4evskiy 54c8cc0f66 Some cleanup 2014-08-14 13:56:19 +04:00
Lo6a4evskiy 04ce0616e7 Cannot place one-way glass by clicking on destroyed grille 2014-08-14 13:50:41 +04:00
Lo6a4evskiy 6b628667ed Accidentally left unnecessary comment 2014-08-14 13:36:00 +04:00
Lo6a4evskiy b76595d03e Broken grilles won't summon new rods when hit 2014-08-14 13:33:10 +04:00
Aranclanos ccae5781c5 added two defines CLICK_CD_RANGE and CLICK_CD_MELEE (4 and 8), replaced all changeNext_move() procs to use these two defines.
Added melee click cooldown for paper spam on cameras.
2014-08-03 22:14:56 -03:00
paprka 9747d26081 you no longer kick grilles 2014-07-20 22:58:48 -07:00
Kelenius a8b7588c12 Merge branch 'master' of https://github.com/tgstation/-tg-station into Temp
Conflicts:
	code/game/objects/items/weapons/grenades/ghettobomb.dm
	code/game/objects/structures/door_assembly.dm
2014-06-19 02:27:10 +04:00
Kelenius 3908160998 One big update for stacks. 2014-06-10 20:36:08 +04:00