Commit Graph

5556 Commits

Author SHA1 Message Date
Nerd Lord
a0b2b0a721 Couple of small fixes.
thou shalt not flee the will of nar-sie
2015-12-05 19:09:21 -05:00
Nerd Lord
953f175d2e Hostile mobs don't get a target if the damage dealt is 0 or less. 2015-12-05 10:58:08 -05:00
Nerd Lord
58a3f742c6 Spawnable hostile constructs, for away missions and adminfuckery. 2015-12-05 10:48:52 -05:00
Razharas
7037877028 Merge pull request #13420 from AnturK/outofideas
Removes unused virus var
2015-12-04 21:57:24 +03:00
paprka
717b857401 Merge branch 'BeamVines' of https://github.com/RemieRichards/-tg-station into remiepls
Conflicts:
	code/datums/beam.dm
	icons/mob/animal.dmi
	tgstation.dme
2015-12-03 23:20:12 -08:00
Remie Richards
fbe6c9550d Merge pull request #13384 from neersighted/pull_release
Make Ctrl-Click unpull work by using the verb
2015-12-03 21:56:17 +00:00
Razharas
626ee1d20c Merge pull request #13356 from Thunder12345/guards!guards!
Adds summon_backup() to hostile animals
2015-12-03 21:44:36 +03:00
Thunder12345
9ea8530133 Typos plssssss 2015-12-03 18:38:56 +00:00
Thunder12345
eb2e935100 Changed faction check 2015-12-03 18:22:03 +00:00
AnturK
5dcfbeab20 Removes unused mob var 2015-12-03 18:52:30 +01:00
duncathan salt
2cbc76c731 Merge pull request #13391 from Razharas/SlipLog
Added logging to slips
2015-12-03 10:05:00 -06:00
duncathan salt
19fc2d952a Merge pull request #13392 from Razharas/GrabLogs
Added logs to when someone tries to click something with a grab
2015-12-03 10:04:42 -06:00
Jordie
428ad00bb4 Merge pull request #13395 from neersighted/nano_touchup
Fix NanoUI for admin ghosts.
2015-12-03 14:24:43 +11:00
Nerd Lord
6bd6b7ccf5 Conflixed 2015-12-02 20:30:38 -05:00
Nerd Lord
b16ed6d5b8 oldcode deserves to die
juggernaut reflection uses the apply damage proc correctly instead of checking if the damage type is brute or burn
2015-12-02 17:50:21 -05:00
Nerd Lord
a54356f460 Removes terrible, unnecessary bullet_act() from constructs, replacing it with the proper damage_coeff list.
I'd bet money it was there just so ebows couldn't damage constructs.
2015-12-02 17:43:59 -05:00
Bjorn Neergaard
1d60873949 Fix NanoUI for admin ghosts.
Also, rename the base state file.
2015-12-02 12:53:36 -06:00
Razharas
52fd90b9e4 Added logs to when someone tries to click something with a grab, like table/cryo 2015-12-02 19:04:44 +03:00
Razharas
c9069cc358 Added logging to slips 2015-12-02 18:27:11 +03:00
Jordie
399accf949 Merge pull request #13347 from neersighted/pull_release
Allow you to stop pulling by pulling the same object again.
2015-12-02 15:53:18 +11:00
Nerd Lord
0174352a05 YOU CAN'T REPAIR DENTS THAT DON'T EXIST 2015-12-01 23:16:21 -05: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
Nerd Lord
9f35e17513 Gives artificers feedback when healing another construct, showing how much health it has.
Constructs can into space.
Fixes cult flooring not lining up with normal floors, I don't care if you're evil, this is just wrong.
Fixes a juggernaut back spine being not glowy enough.
2015-12-01 23:05:41 -05:00
Razharas
e091d35439 Merge pull request #13334 from AnturK/botfix
Bot fixes
2015-12-01 21:00:23 +03:00
Thunder12345
07a9aa65b8 More efficiency things 2015-12-01 17:32:33 +00:00
Thunder12345
e628f4869b Makes faction checking more efficient. Adds a chime to go with the exclamation mark. 2015-12-01 17:15:46 +00:00
Bjorn Neergaard
8b77dd0de1 Finally get this pulling check right 2015-12-01 08:37:38 -06:00
Thunder12345
f3b0847042 ! 2015-12-01 14:32:10 +00:00
Bjorn Neergaard
2a7be3c878 Fix swapped check 2015-12-01 07:30:20 -05:00
Thunder12345
a0394c94ed Adds summon_backup() to hostile animals 2015-12-01 11:00:02 +00:00
Bjorn Neergaard
c523dfcb85 Allow you to stop pulling by pulling the same object again. 2015-11-30 22:27:41 -05:00
Kyle Spier-Swenson
2d9ecd54a9 FIXES DEAD CHAT QUICK MERGE PLS 2015-11-30 17:26:58 -08:00
Cheridan
0a62f392e5 Merge pull request #13299 from MrStonedOne/patch-75
Gives deadchat the (f) follow link.
2015-11-30 13:23:40 -06:00
AnturK
a8ea3e25c1 Fixes player medbot overdoses
Makes braindead bots get back to work.
2015-11-30 16:52:25 +01:00
AnturK
b216ffe457 Fixes Player bots moving while deactivated
Fixes Player bot radios
Removes unused HEADSET_SECURE radio mode
Adds secbot/ed209 stuns to attack log
Allows player mulebots to drop the cargo by resisting
2015-11-30 14:07:38 +01:00
Cheridan
c2d4f17fb7 Merge pull request #13297 from YotaXP/swarmer-crystal
Make swarmers drop a bluespace crystal
2015-11-30 01:44:57 -06:00
Cheridan
5e9017977d Merge pull request #13298 from neersighted/attack_anim
Improve Attack animations
2015-11-29 23:17:02 -06:00
Cheridan
3f231755cf Merge pull request #13295 from KorPhaeron/wj_hates_fun
Removes simple xenomorphs from gold slime cores
2015-11-29 18:07:09 -06:00
Cheridan
126e2ce5e3 Merge pull request #13289 from phil235/HostileAnimalProjectileFix
Hostile Animal Projectile Fix
2015-11-29 17:25:24 -06:00
YotaXP
3c005616d5 Make swarmers drop ARTIFICIAL bluespace crystals. 2015-11-29 16:18:42 -05:00
Remie Richards
edfb957bd2 Merge pull request #13088 from as334/master
Plasmamen fixes
2015-11-29 19:17:11 +00:00
as334
0048a5b2a7 Fuck this, fuck you 2015-11-29 14:10:46 -05:00
as334
dc98e67f05 Just fuck my shit up fam 2015-11-29 13:48:58 -05:00
duncathan salt
a9cfc6eb8a Merge pull request #13288 from AnturK/topicfix
Fixes AI canUseTopic
2015-11-29 12:35:03 -06:00
duncathan salt
f7eae879d2 Merge pull request #13004 from Shadowlight213/mobbuffs
buffs syndicate simple mobs
2015-11-29 12:33:09 -06:00
duncathan salt
9e9ccf9474 Merge pull request #13268 from Anonus/teachingsofnarsie
Cult theme update
2015-11-29 12:23:07 -06:00
Nerd Lord
fba1c1129a fine, fine fuck okay sure
don't sacrifice dogs, okay? nar-sie has standards, of a sort
2015-11-29 13:11:18 -05:00
Jordie
3fce4f80be Merge pull request #13246 from KorPhaeron/stop_getting_shot_godamn
Allows you to forcibly recall your guardian/parasite
2015-11-29 21:07:29 +11:00
Jordie
aa672d3e95 Merge pull request #13230 from JJRcop/i12317
Fixes changeling hivemind download
2015-11-29 21:07:18 +11:00
Jordie
38eddb1421 Merge pull request #13179 from AnturK/academy
Wizard Academy Away Update
2015-11-29 21:06:34 +11:00