Commit Graph

99 Commits

Author SHA1 Message Date
oranges
97eb86f34d Adjacency check for grab and code move
Fixes human species grabs not checking for adjacency before grabbing
when using the ctrl click hotkey.

Moves the code into the click code and not down in the martial arts code
2016-10-19 21:55:34 +00:00
MrPerson
5047dd7145 Plane master handling + new chemical Rotatium (#20707)
* Plane master handling + new chemical Rotatium

A whole system to create, store, and access screen master objects from the hud. In case anybody actually wants to do anything relevant with them. Which will probably be me but whatever.

Moves things out to some planes that make sense.
click catcher -99
game 0
lighting 15
fullscreen 18
HUD 19
above HUD 20

Rotatium is more of a demonstration than something I really really love, but it is kinda neat so here you go. It rocks the game plane and lighting planes back and forth and also does light toxin damage. The longer it effects you, the stronger the rocking gets.

No pictures right now, I'll get some later. Sorry.

* Pay no attention to the commit behind the curtain

* Updates travis to 1346, the stable version for 510 for linux
2016-10-18 11:41:23 +02:00
Joan Lung
db19c0bb8f Fixes items calling attackby on themselves 2016-09-15 07:54:50 -04:00
Remie Richards
00738bd2a3 More than 2 hands!? WHAAAAAAT 2016-09-02 16:10:16 +01:00
Core0verload
e666d2e76b ports pockets (from Animus Green) and adds them to some clothing.
This PR ports pockets (from Animus Green) and adds them to some clothing.

 Shoes that support storing items now use pockets system.
 Some hats have 1 small pocket.
 Detective's hat spawns with a flask in it.
 Clown's mask has a single tiny top-secret pocket. Honk!

This PR also includes two or three path fixes. It also fixes internal storages (pockets, storage implant) having less "max depth" than external ones.
2016-07-14 19:36:26 +12:00
Remie Richards
fda2c699fc Automatic conversion via Regex 2016-06-11 18:37:48 +01:00
Lularian
8aa135f470 fixes some of the crap maybe 2016-05-28 11:08:46 -05:00
phil235
11ca987acb Merges Pull and Grab into a single functionality. Pulling someone is now the same as a passive grab. You can start pulling someone with ctrlclick or by using the grab intent with empty hand. Using the grab intent again on the pulled person tries to grab them aggressively, then neck grab, then kill grab.
Two mobs can no longer pull the same mob at the same time. Pulling someone break any other pull/grab from other mob on that person.

The grab item is gone entirely.

You can now only grab one mob at a time, instead of two (one for each hand).

Being aggressively grabbed or more now counts as being restrained (like handcuffed). A neck grab or more makes you lie down and prevents you from getting up until the grab is broken.

Fixes movement when moving with a grabbed person.
Fixes movement when moving a pulled person around you diagonally.
Fixes neckgrab moving the victim on your turf even if the turf is dense.
2016-05-24 01:28:04 +02:00
paprika
28a8387b17 initial commit 2016-05-07 14:39:17 -07:00
nullbear
8a2e8935c7 adds QoL hotkey for pointing. 2016-05-04 15:48:21 -07:00
KorPhaeron
0bbcc00c4d Revert "Move some stuff from different layers to different planes" 2016-04-29 16:07:23 -05:00
MrPerson
3f70f880ac Move some stuff from different layers to different planes
Moves everything on a 15+ layer to a plane. So now you get screen catcher (-99, was already on a plane), lighting (15), effects that ignore lighting (16), fullscreen UI effects (18), screen objects used to build the UI (19), actual equipment in the UI slots (20), and everything else (0).

Also created a file to contain plane and layer defines for hopeful eventual use.

Hopefully this doesn't change anything now but does enable some nifty new features in the future.
2016-04-24 04:03:41 -07:00
KorPhaeron
6d437be6a5 Improvements 2016-04-23 15:35:43 -05:00
KorPhaeron
c771988284 Gatling Autoclick 2016-04-23 13:47:05 -05:00
AnturK
77ee2ded62 Renames click intercept method to avoid collision with ClickOn 2016-02-20 15:39:14 +01:00
Fox-McCloud
3da281caa8 Adjusts Laser Eyes 2016-02-12 15:40:27 -05:00
duncathan salt
c04acddef9 Merge pull request #15381 from neersighted/runtime_meet_proc
Fix a number of runtimes
2016-02-10 23:50:38 -06:00
AnturK
e93fbcd2a0 Cleanup 2016-02-10 16:30:43 +01:00
AnturK
a1583f24ae Buildmode Refactor
Adds generic click intercept to clients
2016-02-10 16:29:47 +01:00
Bjorn Neergaard
72fbf9a181 Fix click catcher runtime
Check that a turf exists when attempting to click it
This can happen if someone manages to click off the edge of the Z-level

The following runtime has occured 48 time(s).
runtime error: Cannot execute null.Click().
proc name: Click (/obj/screen/click_catcher/Click)
  source file: click.dm,345
  usr: Drone (758) (/mob/living/simple_animal/drone)
  src:  (/obj/screen/click_catcher)
2016-02-09 23:06:43 -06:00
Bjorn Neergaard
a5f09e103e Remove eroneous code; click catcher define; bygex path fix 2016-02-04 17:19:47 -06:00
Bjorn Neergaard
7a47b43c53 Re-implement screen overlays
This fixes 510 showing all overlays in the rightclick menu
2016-02-04 17:19:44 -06:00
Bjorn Neergaard
063dd9fb84 Get the code running on 510
* Travis for 510
* Remove json, list2text, text2list, bygex
* Change blind and click catcher to a low plane
2016-02-04 17:19:40 -06:00
Firecage
7f96592b87 Merge Conflict Fix 2016-01-27 13:29:38 +02:00
Razharas
34d4f155d1 Fixes sleep clicking
Fixes sleep clicking
Fixes https://github.com/tgstation/-tg-station/issues/14456
2016-01-19 15:10:23 +03:00
Firecage
0cb6814c18 Merge conflict fix 2016-01-17 19:15:30 +02:00
Firecage
754491ce4c Changes relatives paths into absolute paths and makes some if()'s better 2016-01-17 01:36:56 +02:00
Kyle Spier-Swenson
e6036789dd Simple compile error fix 2016-01-16 10:20:38 -08:00
Kyle Spier-Swenson
bf529e2ea5 You can now control click on turfs. 2016-01-16 07:20:55 -08:00
Bjorn Neergaard
e96590ff59 Make Ctrl-Click unpull work by using the verb
Did not realize this didn't use the verb.
2015-12-01 23:08:07 -05:00
Remie Richards
440b8b1b4e Adds some variables to allow per-mob "reaction times" that modify the delay between clicks/actions/interactions. 1 is a flat decisecond +/- the other is a Multiplier, eg 0.5 or 2 2015-10-23 16:52:50 +01:00
c0
f9071e0aae We need to go deeper 2015-08-01 02:28:27 +03:00
phil235
34db8dd695 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/mecha_equipment.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/game/mecha/mecha.dm
2015-07-16 13:50:01 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235
359a270de6 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
2015-07-14 01:20:37 +02:00
phil235
9cc577273f added update_action_buttons to mmi life subproc
Fixes seraph smoke not working.
buff energy relay so it's closet to the old effect
Fixes 6812 (mmi in mech cant use equipment) somehow.
Moved check to prevent drilling inventory to mecha/click_action so that it also happens with an AI occupant.
Fixes 9562 (verbs sometimes aren't given to the pilot) by removing the verbs
Upon destroy() we delete cabin_air: Fixes 8110
Changed armor booster availability back to all mechs.
Fixes repair droid overlay not updating when turned off after repair done
Fixes heavy plasma cutter not being attachable to anything.
2015-07-08 02:24:29 +02:00
Razharas
cdc32a50c3 Made special object instead of using blindscreen
Made special object instead of using blindscreen
2015-06-06 07:10:46 +03:00
Jordie0608
6b524f09a9 eol fixes (probably) and examine fix in closets 2015-05-28 20:48:47 +10:00
phil235
554760e5f2 Merge pull request #9512 from xxalpha/itsakindofmagic
A second handful of fixes.
2015-05-23 16:52:51 +02:00
xxalpha
7d0e67b76d Fixes Laser Eyes messing with X-Ray vision. 2015-05-15 22:40:32 +01:00
Firecage
1d5b06291e Allows drones to use middleclick to swap their hands. 2015-05-15 22:33:18 +02:00
MrPerson
9038fb15af Code cleanup
Removed a bunch of unused or hardly used vars on /mob and /atom/movable.
Added defines for mob/living/var/mob_size so it's not using magic numbers.
2015-03-13 10:41:00 -07:00
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
Iamgoofball
fbfe5e5840 Fixes Chameleon letting you attack and stay invisible. 2015-01-11 09:24:22 -08:00
Razharas
418e3a0613 General cleanup
Fixed the magic text failing in monkey injectors
Removed lots of comments
Didnt fix mysterious list bounds runtime in tourettes
2014-12-29 11:36:01 +03:00
Razharas
8d110ee496 Tiny clean up, still lots of work to do
Only compiletested, these changes were never tested in the game yet
2014-12-12 23:57:11 +03:00
Razharas
c2046105af Ok reverting this shit
Disregard this you know what i do
2014-12-01 00:12:58 +03:00
Razharas
4998b19ddf Merge pull request #5679 from Aranclanos/projectilesBump
Projectiles bump fix, spawn() removal
2014-11-27 03:38:05 +03:00
Razharas
ebfb3b012d Fixes runtimes of the mechs
Fix #5777
2014-11-22 18:34:41 +03:00
phil235
4bdafd02b6 Moving carbon/middleclickon() form carbon.dm to click.dm and centralising it (there was two carbon/middleclickon() proc.
Moving carbon/altclickon() to click.dm as well.
2014-11-07 19:23:30 +01:00