Commit Graph

2778 Commits

Author SHA1 Message Date
MrPerson
a08053e0e5 Make holocarp not constantly take damage
Someone got min and max mixed up!
2014-07-26 16:39:50 -07:00
Alex
45c33db77d Merge pull request #4020 from caelaislinn/bugfix
Various bugfixes
2014-07-26 17:59:07 +01:00
Alex
3ecf0fcc04 Merge pull request #4203 from MrPerson/track_bugs
AI Tracking bugfixes
2014-07-25 09:23:54 +01:00
Cheridan
1e7a737a06 Merge pull request #4145 from Ergovisavi/faction_check
Changes faction to list
2014-07-22 19:10:53 -05:00
Alex
1410641259 Merge pull request #4152 from paprka/fugfix
Fixes security 'preview' sprites in setup
2014-07-22 15:17:05 +01:00
Alex
51e46ef80a Merge pull request #4211 from Firecage/AIcode
Fixes AI code a bit >.>
2014-07-22 15:16:27 +01:00
Firecage
c0c9702c13 Fuck fucking spaces 2014-07-21 14:56:23 +02:00
Firecage
feeead99e9 Fixes AI code a bit >.> 2014-07-21 14:21:41 +02:00
MrPerson
1755ec1db4 Merge branch 'master' of https://github.com/tgstation/-tg-station into track_bugs
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
2014-07-20 03:26:25 -07: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
Kyle Franz
7036ff7735 Fix pressing ready button multiple times when connecting causing the button state to flip back and forth 2014-07-19 21:55:38 -07:00
Kelenius
b67a751d57 Small fixes for camera lights 2014-07-18 02:44:26 +04:00
Kelenius
b938ad2dde Camera light uses cameranet and updates on movement now 2014-07-18 02:26:47 +04:00
Kelenius
80824ecac3 Changes light to Giacom's suggestion 2014-07-17 23:59:58 +04:00
Ergovisavi
9d643789d8 Fix for issue #4173, both soulstone mobs (and construct derivatives) and staff of animation mobs (statues included) are now properly tagged with a faction that is unique to the person that created them, stopping a Wizard's animated mimics from attacking his created constructs. 2014-07-17 00:40:24 -07:00
Kelenius
094d7d139b Makes camera lights not broken 2014-07-15 20:06:04 +04:00
Alex
72423a7bd0 Merge pull request #4059 from Miauw62/goodbyeparapen
Replaces the parapen
2014-07-14 12:47:14 +01:00
Alex
5deccb030c Merge pull request #4125 from Jordie0608/mygrandmacheatedconstantlyatsnapwheniwasatoddler
AI spacecarp hologram
2014-07-14 09:25:37 +01:00
paprka
a2845f7cb9 revert thing 2014-07-13 14:00:28 -07:00
paprka
d541b109a8 fixes sec setup sprites 2014-07-13 13:58:52 -07:00
Ergovisavi
ff17e36750 Changes faction to list and edits hostile mobs to use the list type faction, along with changing existing factions to match the new list type
Also changes trees and space bats to "hostile" faction because they were copypasta'd carp before that, as well as changing goats to "neutral" and attack_self 1 so that the great mining drone / goat wars end
2014-07-12 20:03:46 -07:00
Alex
0dc8aabd42 Revert "Spinning" 2014-07-13 00:55:18 +01:00
Aranclanos
dec8444e12 Merge pull request #4118 from Aranclanos/spinning
Spinning
2014-07-12 20:52:55 -03:00
Miauw
4eb83ed546 Oh, not in cruelty, not in wrath
The Reaper came that day;
An angel visited this damned sat,
  And took the parapen away.

Replaces parapen with sleepypen that contains 30u of sleeptoxin and 30u of a new mutetoxin that makes you unable to speak.

Mutetoxin can be made with 2 parts uranium + 1 part water + 1 part carbon.
2014-07-12 17:48:33 +02:00
Alex
46c3a61fca Merge pull request #4071 from CollenN/panelfix
Spawned humans have DNA, strip panel is better
2014-07-11 19:02:50 +01:00
Alex
537d135d82 Merge pull request #4113 from SodiumShine/cuffs-fix
Fixes handcuffs persisting visually after resist.
2014-07-11 15:02:06 +01:00
Cael_Aislinn
1f0e8baade humans swapping position via bumping with help intent now calls Crossed()
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2014-07-11 23:16:40 +10:00
A
8bc96dcfdc check for legcuffs too 2014-07-11 21:12:26 +10:00
A
dde416fdea Fixed fix for persisting handcuffs sprite (Legcuffs/handcuffs mixup) 2014-07-11 16:16:40 +10:00
A
58c12ae7bb Merge branch 'master' of https://github.com/SodiumShine/-tg-station into cuffs-fix 2014-07-11 15:34:52 +10:00
GunHog
b313228586 Fixes pAI SecHUDs
Replaces "return" with "continue" on line 29. "return" was prematurely terminating the loop, causing pAIs to only see one or a few HUD icons at a time.

I plan to extend these HUDs to the AI in the future, after the freeze.
2014-07-10 09:16:56 -05:00
Jordie0608
4066fe0d1e ai spacecarp hologram 2014-07-10 23:33:03 +10:00
MrPerson
41d3858769 Make dead people stop jittering
Fixes #3690
2014-07-09 02:19:01 -07:00
Aranclanos
83cb25ea41 Added a spinning visual effect to rolling on the floor to extinguish yourself in case of a fire.
Lube will now make you spin while you're slipping.
Water will make you slip on the spot and won't move you forward.
Fixed the bug of wrong mob directions when buckling them while they are lying down.
2014-07-09 05:25:12 -03:00
A
1a0b4ac572 Fixes issue where resisting with handcuffs on would leave player sprite handcuffed as well as hand slots. 2014-07-09 00:34:50 +10:00
Cheridan
8288810ff6 Merge pull request #3531 from Rolan7/Issue3401
Fixes issue #3401 by adding a "SpeciesCanConsume" helper proc
2014-07-08 01:45:36 -05:00
Cheridan
4574a85b05 Merge pull request #4075 from Incoming5643/super_meat_pull
Fixes #4073
2014-07-08 00:49:33 -05:00
CollenN
ccaef08fdc Moves stuff to New()
Alright, I tested it, and this worked, so...
2014-07-07 14:02:58 -04:00
Rolan7
6699761ac3 Correcting a merge error... will probably squash this once I know things are okay. 2014-07-07 13:53:33 -04:00
Rolan7
ffed2a901e 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:47:13 -04: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
Alex
f88b6a6c4d Merge pull request #4069 from AstralSerpent/borgment_harmweldhertz
Using a welding tool on augmented limbs, cyborgs or bots will hurt while on harm intent, instead of heal.
2014-07-07 10:25:45 +01:00
Incoming
ffe331878f *Removes the 95% probability chance of any attempt to harvest meat from various simple animals to fail after dropping one meat. This also means the gib animation will always properly play (provided it exists).
*Meat spawning removed from harvest(), it's always been handled in gib. Harvest still exists due to some overrides on how it works for certain animals (mostly spiders)
*Fixes #4073
*Keeps me marginally relevent ヽ༼ຈل͜ຈ༽ノ
2014-07-06 13:59:15 -04:00
Ben G.
d497387355 Merge pull request #4048 from Kelenius/OfAIAndHUD
Gives the AI a simple hud
2014-07-06 12:58:13 -05:00
CollenN
6b4cf7783b Spawned humans have DNA, strip panel is better
Fixes #4044
Fixes #4064

Spawned humans now have DNA, along with a randomized appearance and
name, making them similar to monkeys turned into humans.

Strip panel is now more organized and doesn't have any duplicated lines.
2014-07-05 22:47:50 -04:00
AstralSerpent
10c9d4d14e Attacking augmented limbs or cyborgs with a welder on harm intent will actually harm. 2014-07-06 02:33:13 +10:00
Firecage
2c0ac7bfd8 Updoots 2014-07-05 15:56:29 +02:00
Firecage
559d83c36e Signed-off-by: Firecage <firecage@hotmail.com> 2014-07-04 16:56:33 +02:00
Firecage
983ac3ed79 Killer Tomatoes
Signed-off-by: Firecage <firecage@hotmail.com>
2014-07-04 16:27:54 +02:00
Cheridan
7cd52c3b6f Merge pull request #4046 from Aranclanos/breathruntime
Too hot or too cold? Fuck that, I'll runtime once per second. Per human.
2014-07-03 20:00:11 -05:00