Commit Graph

201 Commits

Author SHA1 Message Date
GunHog
63b2fc2555 Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition
Conflicts:
	code/game/machinery/bots/ed209bot.dm
2014-10-22 17:49:52 -05:00
GunHog
20bd9976b7 Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition
Conflicts:
	code/game/machinery/bots/bots.dm
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/floorbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/mulebot.dm
	code/game/machinery/bots/secbot.dm
	code/game/objects/items/devices/PDA/cart.dm
2014-10-21 18:06:04 -05:00
Francis
adf252df9b Keep the define around as that is a good idea 2014-10-20 22:49:06 +13:00
Francis
6eb4793801 Revert "Adds click cooldown to clicking on mobs Fixes #4812"
This reverts commit 7116584db1.
2014-10-20 22:23:19 +13:00
Francis
5f8380304a Revert "Make handcuff click cooldown a define"
This reverts commit 7da7fdbaab.
2014-10-20 22:23:07 +13:00
Francis
25d587a483 Revert "Cleaning up unecessary cooldown changes"
This reverts commit 970c61844f.
2014-10-20 22:22:51 +13:00
hornygranny
3224cdc151 Merge pull request #5182 from RemieRichards/XenoLeaping
Alien hunter leap ability
2014-10-17 07:36:57 -07:00
Remie Richards
4256e2f264 Merge branch 'master' of https://github.com/tgstation/-tg-station into XenoLeaping
Conflicts:
	icons/mob/alien.dmi //Curse you WJ!
2014-10-15 15:08:12 +01:00
Aranclanos
d2d92dd35f Merge pull request #4873 from optimumtact/clicktyclackety
Adds click cooldown to clicking on mobs Fixes #4812 Take2
2014-10-15 11:03:02 -03:00
Swag McYolosteinen
cd60db5e18 Merge pull request #5124 from MrPerson/implant_action_button
Give implants an action button
2014-10-11 18:15:44 +02:00
Remie Richards
d9dd60418d Alien hunters can now leap, Hitting a mob stuns it, Hitting anything dense stuns the alien for a short time 2014-10-11 02:40:27 +01:00
Francis Devine
970c61844f Cleaning up unecessary cooldown changes 2014-10-09 14:49:28 +13:00
Francis Devine
7da7fdbaab Make handcuff click cooldown a define 2014-10-09 14:49:28 +13:00
Francis Devine
7116584db1 Adds click cooldown to clicking on mobs Fixes #4812 2014-10-09 14:49:27 +13:00
Cheridan
f96b017149 Merge pull request #5097 from phil235/Msg1Fix
Fixing a lot of messages
2014-10-07 12:09:01 -05:00
MrPerson
1995ac638b Allow activating implants even when stunned and such
Make ninja implants show up right
Add a changelog for the action_button stuff
2014-10-07 01:04:10 -07:00
Cheridan
f5b5ead3ef Merge pull request #4516 from MrPerson/examinate_the_doctor
Change examine() from an atom verb to a mob verb
2014-10-05 23:37:34 -05:00
phil235
dd7a3b7fbc Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix
Conflicts:
	code/modules/admin/admin_verbs.dm
2014-10-05 13:48:11 +02:00
Cheridan
e8a56ee14b Merge pull request #4949 from hornygranny/alienpockets
alien pockets removed
2014-10-04 23:53:06 -05:00
Cheridan
08be1b34eb Revert "Changes a few green crosses to blue on sprites that I missed last time" 2014-10-04 19:22:10 -05:00
phil235
537280b4b9 Removing many instances of the no longer used second argument of message_admins() proc.
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
2014-10-05 01:29:30 +02:00
MrPerson
651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
GunHog
589c1f4cbb Botcall, TG edition! 2014-09-25 09:44:41 -05:00
Hornygranny
e05c21502b alien pockets removed
resin stacking removed
2014-09-22 15:29:09 -07:00
Remie Richards
be079897e1 Adds default toolbox for drones, Moves drone hud to drone hud file, ticks drone hud file. 2014-09-21 20:39:29 +01:00
JJRcop
7356d49b04 Adds some missing drone things from the previous PR:
+Missing head/mask slot because drones.dm is not currently being compiled
 +Missing weapon/storage not allowing drones to MouseDrop
 +Missing uplink buy() preventing non-humans to use it
 +Missing syndrone sprites

Adds new drone things that weren't in the previous PR:
 +Drone pings respect factions
 +Moved drone ping message functionality into its own proc
 +Alerts all drones about newly activated/reactivated drones
 +Alerts all drones about dead drones
 +Gives the syndrone the "syndicate" faction, overriding the default "neutral"
 ->Redirected gib() to dust()
 ->Redirected update_inv_l_hand() to update_inv_hands()
 ->Redirected update_inv_r_hand() to update_inv_hands()
 ->Redirected update_inv_wear_mask() to update_inv_head()
2014-09-21 01:20:20 -04:00
Remie Richards
9271b55bc3 Missing define. 2014-09-20 20:25:03 +01:00
Remie Richards
7c6a4be774 Adds all the new stuff back again, PR issues. 2014-09-20 20:04:10 +01:00
Cheridan
f5bf1ddaa9 Merge pull request #4809 from RemieRichards/Drones
Ports Drones from NTstation + New Improvements/Features
2014-09-17 16:56:40 -05:00
JJRcop
b1eb790033 Adds button when pulling something
Fixes drone laws indentation
2014-09-14 23:40:17 -04:00
JJRcop
f9a0fe6b2f Makes the drone internal storage much more user-friendly 2014-09-14 04:57:30 -04: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
Remie Richards
473bcd1858 Ports Drones from NTstation + New Improvements/Features 2014-09-13 15:02:57 +01:00
Hornygranny
02e527e938 Merge branch 'smoothaliens'
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/modules/mob/living/carbon/alien/alien.dm
2014-09-07 21:33:48 -07:00
Cheridan
7750a2baae Merge pull request #4525 from GunHog/HUDS_For_All
Silicon Medical and Security HUDs!
2014-09-07 20:01:12 -05:00
GunHog
b1fefb6bb1 Giacom's suggestions + Borg HUD tweak
- Both HUD procs broken in to several smaller procs.
- Added defines so the arguments to process_data_hud() are clear.
- Several other tweaks to data_huds.dm
- Made the sensor mode defines match the data hud ones.
- Gave borgies a HUD button for sensor modes instead a verb, to be in
line with the AI.
2014-09-02 18:32:06 -05:00
Cheridan
e0d171e7bf Merge pull request #4483 from ChuckTheSheep/direct-intent
Direct intent clicking (redo)
2014-08-31 11:25:47 -05:00
Alex
837d5bc7eb Merge pull request #4456 from Ikarrus/table_prints
Fingerprints for Cables and Tables
2014-08-31 17:11:14 +01:00
MrPerson
a23dbe2357 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
Conflicts:
	code/game/objects/items/devices/radio/radio.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/events/ninja.dm
	code/modules/power/cell.dm
	code/modules/power/port_gen.dm
	code/modules/reagents/reagent_dispenser.dm
2014-08-29 04:21:15 -07:00
Hornygranny
ca77a4e31d more icons for stuff, nightvision for aliens with hud icon button and toggle verb 2014-08-27 15:16:28 -07:00
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
GunHog
1dbc2756a6 RR's tweak + derpfix
Makes the sensor augmentation check for silicon instead of one for both
the AI and Borgs, since they are not actually different procs.

Reverts an accidental removal of the borg camera function, thinking it
came from NT's code.
2014-08-22 08:00:02 -05:00
GunHog
81e178737d Silicon Medical and Security HUDs!
- The AI can now access both Security and Medical HUDs via a new button
on its UI. The Medical HUD is exactly equal to all others. The AI's
Security HUD cannot detect implants.

- Cyborg HUD modules have been removed in favor of an inbuilt command,
to make it less of a hassle to access them.

- HUD code has been given its own file such that it can be used by any
mob. In addition, HUD users are placed into a list instead of searching
for only humans and checking them for a HUD item. This is to make it
easier to expand.

- Security HUD messages can now be received by any mob using a SecHUD.
2014-08-21 22:59:30 -05:00
MrPerson
d0c97aae72 Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor
Conflicts:
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/game/gamemodes/cult/ritual.dm
	code/game/gamemodes/nuclear/pinpointer.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/status_display.dm
	code/game/objects/effects/decals/crayon.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/weapons/airlock_painter.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/storage/secure.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/mousetrap.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/slime/examine.dm
	code/modules/power/cable.dm
	code/modules/reagents/grenade_launcher.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/recycling/sortingmachinery.dm

Thanks Firecage, this is all your fault
2014-08-20 05:54:20 -07:00
ChuckTheSheep
c1d98ba7ae Did I do it right? 2014-08-19 18:15:11 -04:00
ikarrus
e6cbd27adb Removed usability checks 2014-08-18 21:34:05 -06:00
ChuckTheSheep
0682f1b3b8 mah elses 2014-08-18 13:58:55 -04:00
ChuckTheSheep
0d0f6f2157 Redo
This allows you to click which ever intent you want in the four-color
intent system humans have.
Other/simple mobs' still use the old single intent button.

F/G macros still work as well.

continued from: #4473
2014-08-18 06:23:25 -04:00