Commit Graph

117 Commits

Author SHA1 Message Date
Miauw62
b97a61c11f FUCK YOU GIITTTT ;_; 2014-04-08 14:47:05 +02:00
Miauw
5abb553f4a Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
Conflicts:
	code/_onclick/telekinesis.dm
2014-04-08 14:29:58 +02:00
Razharas
00c9e92b82 Merge pull request #3268 from Limeliz/patch-5
Fixes #3263/telekinetic grab showing up on examine
2014-04-07 18:33:51 -07:00
Aranclanos
a86071c3ac Reverts my aphril's fool click delay on mobs stuff 2014-04-02 01:40:02 -03:00
Emil
cf1d5de345 forgot a | 2014-04-02 00:25:55 +02:00
Emil
8ba4273f0c Fixes #3263/telekinetic grab showing up on examine
Fixes #3263.
2014-04-01 23:25:06 +02:00
Cheridan
302f2ea122 Merge pull request #3215 from MrStonedOne/silicon-macros-and-hotkeys
Gives cyborgs ai click shortcuts, adds some click shortcuts, and gives borgs more meaningful hotkeys
2014-04-01 01:27:39 -05:00
Aranclanos
953acabcda right so more stuff I forgot 2014-04-01 01:56:16 -03:00
Aranclanos
594443cf5e For the start of the month, I'll make combat more robust because I think everyone is pretty unrobust.
This won't be reverted.
Happy clicks.
2014-03-30 22:12:24 -03:00
Miauw
b38375faca [violent frothing] 2014-03-30 20:51:30 +02:00
Miauw
dc9ead6575 Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
Conflicts:
	code/_onclick/telekinesis.dm
	code/game/sound.dm
2014-03-30 20:48:03 +02:00
Razharas
3000586e7b Merge pull request #3216 from Aranclanos/ClickDownRemoval2
Click cooldown removal take 2
2014-03-28 02:39:25 -07:00
Aranclanos
7bcb69ad88 Removes the click cooldown from almost everything, now it should be always be 0.1 seconds.
Ranged weapons and laser eyes have a cooldown of 0.4.
Grilles, windows, windoors, walls and blobs have a cooldown of 0.8.
Hitting mobs will also have a cooldown of 0.8.
Removes the unused USEDELAY flag.
2014-03-28 06:32:47 -03:00
MrStonedOne
5a6082c29f fix small typo stopping compiling. 2014-03-28 00:18:07 -07:00
MrStonedOne
a72f70de25 Gives cyborgs control+shift shortcut for access override
Gives cyborg access override shortcut control+shift click that was given to ais eariler
2014-03-27 23:36:12 -07:00
MrStonedOne
69a5e065e8 AI and cyborgs control/alt click shortcuts for turret controls.
Control click toggles turrets on/off state.
Alt click toggles turrent lethal state.
2014-03-27 23:10:21 -07:00
MrStonedOne
636d4d34ae Add access override hotkey control+shift to ai
Also adds framework for control+shift click capturing to _onclick, can be used by most atoms
2014-03-27 21:12:44 -07:00
MrStonedOne
a2e1089c5c Give cyborgs existing ai mouse shortcuts.
Gives cyborgs existing AI control/alt/shift click shortcuts while
allowing for them to be used on non-doors/apc normally. (shift still
inspects, control still drags, etc)
2014-03-27 20:58:55 -07:00
YotaXP
febfa4d1e5 Merge branch 'qdel-with-datums'
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/controllers/garbage.dm
	code/game/atoms.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/modules/mob/mob.dm
2014-03-27 21:46:53 -04:00
ikarrus
561c0f8dda Resolved Conflicts:
code/_onclick/ai.dm
2014-03-25 09:07:38 -06:00
Mloc-Hibernia
8af8a43d6f Initial pass to convert LF to CRLF
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>
2014-03-24 08:53:40 +00:00
YotaXP
3656217c29 Modified qdel() to accept any datum.
The garbage controller no longer bothers nulling out every variable on destroyed objects.
An object can opt to not be collected by returning true from Destroy().  Useful for pools or other edge cases.
Fixed boxes not being collected, along with a couple other things.
Turfs will not be monitored for collection.
generate_ion_law() is no longer a /datum proc, and I am an admin in the repo.  Deal with it.
2014-03-24 00:10:43 -04:00
ikarrus
f389ff5117 Resolved Conflicts:
code/game/machinery/doors/door.dm
2014-03-22 16:49:37 -06:00
Miauw
a80dd4df0f Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
Conflicts:
	code/game/objects/items/weapons/AI_modules.dm
2014-03-22 17:42:07 +01:00
ikarrus
8913ed63c0 -Added a span at pete's request
-Blocked the AI from using shortcuts to interact with emagged doors
-Blocked people from closing an emagged windoor
-Blocked a few other operations from opening/closing emagged doors
-Forcing a door open with a crowbar/axe won't cause it to use power or play a sound
2014-03-17 09:43:36 -06:00
Miauw
8c172733a8 Standardizes and expands the warning() and error() procs. 2014-03-09 18:08:19 +01:00
MrPerson
6b29fecda1 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r
Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/rechargestation.dm
	code/game/machinery/turrets.dm
	code/game/objects/structures/crates_lockers/closets.dm
	code/modules/research/circuitprinter.dm
2014-03-08 22:03:03 -08:00
Ergovisavi
6cfe2398d9 Changed around the way things are attacked by objects and got rid of the tapping message as it can screw with afterattack stuff. 2014-03-07 03:19:12 -08:00
Ergovisavi
a3ce04c000 Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss
Item attack changes
2014-03-06 03:17:02 -08:00
MrPerson
3c58091437 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel
Hopefully nothing went wrong but you never know.

Conflicts:
	code/FEA/FEA_fire.dm
	code/controllers/supply_shuttle.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/drying_rack.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/projectiles/projectile/magic.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_dispenser.dm
2014-03-02 21:39:27 -08:00
MrPerson
917a2dd2a4 Rename equip_to_slot_or_qdel() -> del()
Still qdel()'s them, just naming the proc back.
Should hopefully reduce the number of lines different in the pr.
2014-03-02 21:08:25 -08:00
MrPerson
9eee3e5067 First pass at a qdel() garbage collection system for tgstation
Works pretty well. If it can't GC something, it'll just del() it and be done.
Speed is amazing, holy shit.

New procs you should be aware of:
qdel(atom/movable) - sets up an object for garbage collection. Call this rather than del(atom/movable).
atom/movable/Destroy() - called right before the object is GC'd, so it still has a loc. Also called if the object is del()'d.
new controller - garbage.dm has all the details on this. Basically it nulls all references on GC'd objects and force del() them if necessary.
Generally speaking, objects should use Destroy() for behavior prior to deletion rather than Del(). You should also always call the parent so the object gets the right gc_destroyed var set.

ISSUES:
Tries to GC mobs atm. This actually works for new players, not so much for humans/monkies/simple_animals/anything. I'm guessing it needs to clear out their mind and HUD and maybe other things.
Gibbing is really bugged. It works, but the overlays just sit there for awhile and ugh. I'm very tempted just to del() mob/living and mob/camera and call it a day.
qdel() equipment doesn't unequip the item.
Pipes don't generally GC correctly. Debugging suggests they get referenced in many pipenets and that isn't cleared properly. However some do work fine. Need assistance here.
Bots don't GC, probably in the radio controller.
Lots of other shit doesn't GC but it's hard to find them because of the pipe spam.
I think I'm calling Destroy() twice by accident.
2014-02-23 14:55:12 -08:00
Aranclanos
d7db80f67c removes a spawn() from the MouseDrop() proc 2014-02-21 08:59:32 -03:00
hornygranny
aa303fac2d Monkey attack messages now use span class 2014-02-12 16:43:31 -08:00
hornygranny
4933571c5e Changed "Monkey (420) has bit x" messages to "(Monkey (420) bites x" 2014-02-12 13:57:47 -08:00
Razharas
aa71a5f2ca Monkey trouble fix
It wasnt even checking is monkey had a disease. it was monkifying humans
straight, assuming all cuffed monkeys should be jungle fevered
2014-02-10 10:42:54 +04:00
adrix89
5bfe0cbd61 Merge branch 'master' of https://github.com/tgstation/-tg-station into attack_override
Conflicts:
	code/_onclick/item_attack.dm
2014-02-03 18:07:45 +02:00
Cheridan
8762187a59 Merge pull request #2562 from MrPerson/only_the_dead_know_peace_from_this_evil
Dead people no longer turn to face things when they examine.
2014-02-02 16:39:50 -08:00
MrPerson
4ffd2cf5a4 Allow anyone whose living to turn on examine. 2014-02-02 15:07:09 -08:00
adrix89
869f4efa0a I finally realize what was causing the click issues,so now it works with proximity flag. 2014-02-02 15:31:56 +02:00
MrPerson
294b87b20f Dead people no longer turn to face things when they examine. Nor does anyone else who can't move for that matter. 2014-01-30 15:28:52 -08:00
Jesus Hussein Chris
52339906c4 Attack sounds for all melee weapons
Weapons that do no damage play a tap sound, except for the bike horn and banhammer.

Adds a different attack message for forceless attacks. It says tapped or
patted on instead of attacked in.

Adds force zero check to armour before attempting to block attacks.

Adds hitsounds to the welder, lighter, matches, cigarettes, energy sword and energy axe for when they're on and off.

Adds 5 force to the lighter when it's lit. Same as when you accidentally burn yourself lighting it. Adds a hitsound and the correct damage type to the lighter.

Adds hitsound volume scaling based on the weapon's force and its weight class. Adds tap sound scaling based on a weapon's weight class.

Removes boldness from item attack messages on non-human mobs. The attack is still bolded for the player
controlling the mob.

Adds a force check to blood spurts when attacking non-human mobs. If the weapon doesn't have a force, no blood will come out.

Adds adminhelp.ogg as the banhammer's hitsound with Cheridan's permission.

Adds a much needed period to the catatonic human examine message.

Makes the activation and deactivation sounds of toy swords, energy swords and energy shields quieter. What an earsore.

Makes description, item_state and name of matches that have burned out on their own consistent with those put out by the player. Changes match, cigarette and lighter attack verbs and forces based on whether they're lit or not.

Fixes a bug that allowed players to light cigarettes with burnt matches.

Names lit cigarettes and children of cigarettes lit [name].

Fixes a bug with the energy blade that kept it at weight class 5 after it was deactivated.

Changes the welder out of fuel message slightly to be less fragmented.

Removes dead air from most of the weapon sound effects used in this pull to make them more responsive. In other words, the fire extinguisher sound will play a lot sooner after you click than before. Equalised their peak volumes to all be -0.1dB and in an attempt to make altering volumes based on force more consistent.

Thank you @YotaXP for help with the item_attack.dm attack messages.

Thank you @optimumtact for help with code for testing item_attack volumes.

Thank you @Giacom for help with the code for scaling hitsound and tap sound volume by hitforce.

Thank you @Tastyfish for telling me why my proc wasn't working.

Thank you to anyone else on #coderbus who helped me who I've forgotten to mention.
2014-01-28 22:46:41 +13:00
fleure
8660698ce0 Merge pull request #2444 from Miauw62/somebodyfinallydoessomethingaboutnewlingsuckingpleaselickmyfeetnow
Adds changeling arm blades
2014-01-24 12:49:05 -08: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
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
Miauw
168a0d4fab Improves changeling arm blades with some ALL NEW FEATURES #WHOA #WOW 2014-01-20 19:56:18 +01:00
adrix89
8658feae33 Remove adjenct check from click,and move it after attack self
Fixed https://github.com/tgstation/-tg-station/issues/761
2014-01-20 10:21:51 +02:00
Pete Goodfellow
fd4df85045 Changed legcuffs to use slowdown instead of forcing the user to walk. 2014-01-19 20:17:23 +00:00
adrix89
f280a46847 Implement an preattack override for your self contained snowflake needs 2014-01-19 17:27:13 +02:00