Commit Graph

151 Commits

Author SHA1 Message Date
Cheridan 0198ec2bde Merge pull request #4576 from Firecage/SPANCLASSES
SPANCLASSES!!!!!
2014-08-26 15:05:12 -05:00
Firecage 6c7af5eb32 SPANCLASSES!!!!! 2014-08-26 09:52:13 +02:00
ikarrus ad4ba1126a Runtime fix 2014-08-24 22:03:14 -06:00
Alex 51554bf3d2 Merge pull request #4464 from Firecage/helperonclickabsolutes
absolute paths for files in _HELPERS folder and 1 file in _onclick folder
2014-08-17 13:44:23 +01:00
Firecage fab981f72e absolute paths for files in _HELPERS folder and one file in _onclick folder 2014-08-16 13:19:46 +02:00
Cheridan 4030165734 Merge pull request #4074 from AndroidSFV/aiphotoext2take2
AI Photography Extention 2 (The Redux)
2014-08-15 19:32:17 -05:00
Alex bec4e856ca Merge pull request #4327 from Aranclanos/clickcooldowndefine
Defines for click cooldown numbers and click cooldown for paper camera spam.
2014-08-05 10:22:52 +01:00
Alex 0adf11b9d5 Merge pull request #4319 from MrPerson/only_the_dead_know_peace_from_this_evil
Sanity check to prevent ghosts from going to nullspace
2014-08-04 09:21:56 +01: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
MrPerson 1a991974e1 Sanity check to prevent ghosts from going to nullspace
Fixes #4310
2014-08-02 17:36:03 -07:00
Aranclanos 76a709cda2 Changes the message of the F12 button to toggle the HUD, adding a string mentioning that you need to use F12 to use it, in case of pressing it by accident. (Yes it happens) 2014-08-02 20:52:22 -03:00
AndroidSFV fad2bb1244 Fully implemented AI photography, with HUD! 2014-07-30 15:21:30 -05:00
MrPerson fb6b7f1225 AI Tracking bugfixes
Fixes #4201 by adding a cancel button to the track mob list.
Fixes a runtime that pops up if you double click the "Track Mob" or "Show Camera List" buttons on the AI hud. Problem is that double clicking runs a proc that builds the datum of lists of trackable mobs twice, and then both procs sleep because of input(). When the first track completes it nulls the tracking datum, which causes problems for the second (or more) tracks which expect the tracking datum to not be null. Solution: Keep the datum around and simply rebuild the lists as-needed instead of creating and deleting the tracking datum datum pointlessly.
2014-07-20 03:21:02 -07:00
Rolan7 0fa91b06f1 Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue3401
Conflicts:
	code/modules/mob/living/carbon/monkey/monkey.dm - I don't know why it thought there was a conflict.  Opening it in tortoisemerge showed no conflicts and automatically cleared the status.  I reset to the repo's version just to be safe, then re-added my freakin 2 line function which has caused 2-3 "conflicts" so far.
2014-07-07 13:42:31 -04:00
Aranclanos c65aa2b5a4 Merge pull request #4000 from Cheridan/terribleidea
MONKEY MODE REDUX
2014-06-30 16:27:22 -03:00
Rolan7 98367cb162 Changelings can use hivechat while muzzled.
Monkey-lings can use hivechat.
Lings can return to human form even if monkeyed through genetics.
One-line fix for Destroying Angels (..() wasn't being called)
Spelling correction in Destroying Angel description
2014-06-17 00:13:56 -04:00
Cheridan 352d5a5627 MONKEY MODE REDUX
AHUAHEUAHUHEGUEHGAUHEGUAEH

monkeys will now possibly transfer all diseases on bite because that's how diseases kinda work
2014-06-14 21:30:25 -05:00
Cheridan 514ed5f0af Merge pull request #3805 from Menshin/hud_and_pulling
Non-human HUD polishing (stop pulling and intent buttons)
2014-06-13 17:58:49 -05:00
Alex 0aa1b9cae1 Merge pull request #3907 from Ikarrus/nosearchstrip
Non-carbon mobs can no longer search storage items
2014-06-13 09:16:59 +01:00
ikarrus a8432993c0 Cyborgs can no longer strip people or search storage items
-Secborgs can still use their handcuff module to uncuff people
2014-06-11 21:50:41 -06:00
phil235 3f3797fe7c Fix attack message from hitting monkey,alien,slime with an item.
Also remove useless code.
2014-06-10 20:16:11 +02:00
Rolan7 3e8fece250 Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue3401 2014-06-07 10:13:47 -04:00
ikarrus d50eaaa624 You now face what you are examining when using the verb 2014-05-31 14:11:42 -06:00
Menshin 8beda90c81 * Added a "stop pulling" button to monkeys and alien larva
* Make aliens use their hud "intent button".
* Make monkeys use the current selected (e.g midnight) hud "intent button".
2014-05-28 16:28:53 +02:00
Rolan7 c587fa440d Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue3401
In monkey.dm my SpeciesCanConsume check was conflicting with a new canBeHandcuffed check.  All resolved now.
2014-05-14 11:07:43 -04:00
Rolan7 c7e52e8b40 Replaces the serviceborg beer bottle with a drinking glass, adds beer to the shaker. Emagging unlocks a second shaker with a different icon and description (but the same name) which dispenses beer2 (the disguise chloral) or mutagen or thermite.
MUTAGEN might be controversial I assume...  The service borg has no spray bottle though.

Moves update_robot_modules_display() to fix a UI glitch where using the home to unequip a module wasn't making the module appear in the storage list until it was otherwise updated.

Robots no longer take fire damage from fire stacks, since they're otherwise immune to heat... also, fire stacks will gradually burn off and the borg will stop being on fire.

Service borg emag beer (beer2) was oldchloral instead of newchloral.  Excellent argument against copy-paste.  Fixed.

Removed the dumb "if this happened to be a borg's drink container, refill whatever it's currently holding the most of after a delay" which lead to an easy reagent duplication glitch, and was generally shit.  Fixes issue #1673.

Uncapitalized some drink names which weren't proper nouns, and changed stuff like "Beer glass" to "glass of beer".

This still fixes #3401 too of course
2014-05-09 06:10:35 -04:00
Miauw62 c7d8087917 Merge pull request #3525 from Menshin/adjacent_check_fix
Fixed the adjacent proc to correctly process diagonals checks (fix #3519)
2014-05-05 07:55:56 +02:00
Menshin 726e5d2bf5 Corrected swapped comments 2014-05-05 01:10:18 +02:00
Aranclanos 129401c403 evidence bags will now use attackby() to add items to themselves
removed the preattack() proc
2014-04-29 08:38:51 -03:00
Menshin 8b448390d1 Reverted back to some optimized checks 2014-04-25 09:53:36 +02:00
Menshin e4b640c3ae Fixed the adjacent proc to correctly process diagonals checks (fix #3519). 2014-04-25 01:44:07 +02:00
Miauw 658c753989 Revert "Merge pull request #3218 from AndroidSFV/aiphotoext2"
This reverts commit f2d850ee25, reversing
changes made to 805e2570bf.
2014-04-21 18:59:58 +02:00
AndroidSFV 50cd395c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into aiphotoext2
Conflicts:
	code/datums/wires/robot.dm
	html/changelog.html
2014-04-08 09:28:42 -05:00
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
AndroidSFV 40119ada0c AI Photography Extention #2
Gives the ability to take and view photo to Cyborgs

AI's share their photo album with connected Cyborgs, and connected Cyborgs have the pictures they take saved to the AI's album. If a Cyborg is not connected to an AI, photos are saved to the Cyborg's camera object. If a Cyborg has photos in it's album while not connected to an AI, but is subsequently connected to an AI, the photos are added to the AI's album. This is initiated by pulsing the appropriate wire on the borg.

Cyborgs can attach images to newscaster feeds, from the active album available to it (the AI's, or its own if disconnected)

Cyborgs cannot interact with photocopiers, but however have become a moving printer. They are every inefficent at printing, and thus can only print two color pictures before needing to be refilled with toner (simply click on them with toner in active hand).

Added some span classes to the previous AI photography work.

One minor bug fix to photocopier which could result in a photo object ending up in the 'hand' of an AI or cyborg.
2014-03-28 07:31:14 -05: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