Commit Graph

10603 Commits

Author SHA1 Message Date
Cheridan
04869ad71d Merge pull request #11451 from Aranclanos/carbonreagents
Fixes alien larva breathing.
2015-08-29 20:02:29 -05:00
Cheridan
7a469e240a Merge pull request #11437 from bgobandit/dronepax
Refactors medical stacks used on simple animals.
2015-08-29 18:55:27 -05:00
Cheridan
a724415593 Merge pull request #11450 from Aranclanos/srcisnull
some runtimes and goons r4407 haunting me again
2015-08-29 16:21:35 -05:00
hornygranny
2367ae48c9 Revert "Smooth out gliding so movement isn't (as) jerky" 2015-08-29 13:37:55 -07:00
Cheridan
a904c2a765 Merge pull request #11446 from AnturK/randomfixes
Armor Fix, Restrained SNPC fix
2015-08-29 13:13:49 -05:00
Swag McYolosteinen
137f0e0baf Merge pull request #11159 from MrPerson/smooth_gliding
Smooth out gliding so movement isn't (as) jerky
2015-08-29 17:56:40 +02:00
Cheridan
155f8f6fe7 Merge pull request #11440 from spasticVerbalizer/yesYouAreInSpace
Prevents securing emitters and field gens in space
2015-08-29 10:42:30 -05:00
Aranclanos
8922c974ac Merge pull request #11441 from Jordie0608/thislettersismadefromallnaturalrecycledcommas
Makes .getruntimelog point to correct dir
2015-08-29 11:24:59 -03:00
Aranclanos
3714bdf0d2 Fixes alien larva breathing.
Moves the create_reagets() to carbon New() instead of each subtype calling it by themselves.
2015-08-28 18:21:28 -03:00
Aranclanos
6482bf4e14 Removes the src = null lines from chemistry code, it comes from way back, goons r4407 and its really not needed anymore.
Fixes gas reagents not triggering their reaction on some targets.
2015-08-28 17:51:06 -03:00
AnturK
0e46800fd1 fixes snpc cuff pulling 2015-08-28 19:03:22 +02:00
Jordie0608
ec8ef21515 makes .getruntimelog point to correct dir 2015-08-28 22:20:14 +10:00
Cheridan
e11befbbfa Merge pull request #11356 from Aranclanos/listnull
Fixes the brand intelligence event not triggering the uprising under …
2015-08-28 07:20:03 -05:00
Maarten van den Berg
3430e8824e Prevents emitters and field gens from being wrenched to the floor in space 2015-08-28 13:33:31 +02:00
bgobandit
607170a9ef g merge conflicts. remote-tracking branch 'upstream/master' into dronepax
Conflicts:
	code/modules/mob/living/simple_animal/revenant/revenant.dm
	code/modules/mob/living/simple_animal/slaughter/slaughter.dm
2015-08-28 02:54:43 -04:00
bgobandit
6f6744da33 Refactors healing simple animals with bruise packs. 2015-08-28 02:02:43 -04:00
Cheridan
d824f7b35f Merge pull request #11382 from Ergovisavi/bot_swarm
Adds "Swarmers" - Simple mob side antagonist
2015-08-28 00:21:23 -05:00
Ergovisavi
3737234b9c -Adds swarmer as a language, makes them only able to speak to each other
-Fixes a few structures/machines taking non brute/burn damage from attack_animal
-Adjusts girders to be a little less resistant to explosions
-Span classes all the swarmer messages, bumps their health up to 40
-Adds ability for swarmers to dismantle machines and disable cameras. Some are obviously protected.
2015-08-27 22:10:30 -07:00
Cheridan
7f0f74f100 Merge pull request #11380 from bgobandit/salicyclicassblastusa
Fixes burn kits containing salicyclic acid pills. Adds new burn medication.
2015-08-27 23:53:58 -05:00
Cheridan
d8f8f89203 Merge pull request #11386 from Aranclanos/rapiddupe
Fixes the admin message not appearing under certain conditions when t…
2015-08-27 23:46:57 -05:00
AnturK
99c84a79ea fixes ablative reflect 2015-08-27 22:29:20 +02:00
Cheridan
d7eca4f327 Merge pull request #11340 from phil235/CoinFlipThrowFix
Fixes the do_after progress bar appearing on a coin when flipping+throwing it
2015-08-27 01:00:01 -05:00
Cheridan
be6cc6adf9 Merge pull request #11392 from phil235/SinguloCableNetRebuildFix
An attempt to reduce singulo lag from power wires destruction. 2nd attempt.
2015-08-27 00:48:54 -05:00
Aranclanos
9c9bf4a858 Merge pull request #11393 from Ergovisavi/has_wumbo_gone_too_far
Fixes infinite wumbo-ing
2015-08-27 01:06:03 -03:00
Cheridan
3278a3926b Merge pull request #11358 from phil235/XenoFeatures1
Facehugger inhands, xeno tweaks, and monkey bugfixes
2015-08-26 07:52:31 -05:00
Aranclanos
38e6a09cf9 Merge pull request #11351 from Core0verload/nodirt
Removes dirt from walking on tiles
2015-08-26 06:27:31 -03:00
Cheridan
d92d2a3b18 Merge pull request #11353 from Aranclanos/hardsuithelmet
Hardsuit helmets will now store the suit as a var and they will qdel …
2015-08-25 21:04:52 -05:00
Ergovisavi
6277a80cdb -Fixes infinite wumbo-ing 2015-08-25 14:02:48 -07:00
phil235
d211992ddc Make it so the code doesn't rebuild (propagate_network()) the wire network X times when singulo/explosion destroys a line of X cables at once. 2015-08-25 20:22:30 +02:00
phil235
67a7eb2d5f Merge pull request #11277 from Jordie0608/beforecolortvalllistswereblackandwhite
Changes gold slime core hostile mob list to var
2015-08-25 20:03:13 +02:00
bgobandit
6ab2443255 Adds oxandrolone, a new burn medication designed to work upon ingestion. Adds oxandrolone to burn kits. Adds changelog. 2015-08-25 13:46:05 -04:00
Cheridan
d6d036e50f Merge pull request #11355 from Aranclanos/xenohallucination
Fixes a runtime where the xeno hallucination fails to find a vent to …
2015-08-25 11:22:28 -05:00
Ergovisavi
9572bd6aa6 -First revision of Swarmer mob, hud, icons, etc
-Adds functionality of ignored damage types to simple mobs
-Adds functionality of melee damage types to simple mobs
2015-08-25 03:24:34 -07:00
Aranclanos
460c2c290c Fixes the admin message not appearing under certain conditions when the rapid dupe experimentator relic is used.
All objects from said relic will spawn at the same time now.
2015-08-25 05:31:02 -03:00
bgobandit
2c56462e97 I sure do love me some copypasta 2015-08-24 22:45:37 -04:00
bgobandit
132adf3f00 adds silver sulf syringes instead of kelotane pills 2015-08-24 21:45:18 -04:00
bgobandit
ce8722b868 Fixes burn kits containing salicyclic acid pills. 2015-08-24 21:36:50 -04:00
phil235
1f37141b8b Alien humanoids and monkeys can now use "me".
Alien hivemind chat now uses <span class='alien'> (dark purple). Also the alien queen name now appears bigger in the hivemind chat.
2015-08-24 22:53:45 +02:00
phil235
5cecd7e9fe Simplifies plasmavessel/on_life() a bit, and make xeno on weeds also heal clone damage. 2015-08-24 19:54:51 +02:00
phil235
cb1cd5b1e7 Monkey and aliens now all use carbon/examine().
Fixes monkeys being able to strip and uncuff people while handcuffed themselves.
Add an inhand sprite for facehuggers (taken from Xhuis) (but they don't appear for large queens, it'd look ugly).
Xenos now regenerate plasma on alien weed even when injured but at half the normal rate.
Moved queen/large/update_icons() to humanoid/update_icons.dm
2015-08-24 17:07:09 +02:00
Cheridan
227f8cf058 Merge pull request #11335 from phil235/DelToQdelBugFixes
Some bugfixes with qdel
2015-08-24 08:36:42 -05:00
phil235
9f3ce51604 Merge pull request #11293 from Aranclanos/watchlist
Fixes the watchlist edit option not working at all
2015-08-24 14:06:18 +02:00
phil235
eaf4f6b33e Merge pull request #11321 from Jordie0608/comebacktousrevenant
Stops mindless revenants from despawning
2015-08-24 13:39:45 +02:00
phil235
5c23677b77 Merge pull request #11316 from KorPhaeron/escapingfood
Slaughter Demon Fix
2015-08-24 13:33:30 +02:00
Aranclanos
20ba3071ed Fixes the brand intelligence event not triggering the uprising under certain conditions.
Adds a new proc for the list helpers, removeNullsFromList() It does what it says.
2015-08-24 07:52:54 -03:00
c0
9cfb246e4f Removes dirt from walking on tiles 2015-08-24 11:33:52 +03:00
Aranclanos
a9b555d57e Fixes a runtime where the xeno hallucination fails to find a vent to spawn the alien. 2015-08-24 05:11:36 -03:00
Aranclanos
b81ea02552 Hardsuit helmets will now store the suit as a var and they will qdel eachother when deleted. 2015-08-24 04:25:47 -03:00
Cheridan
1cc34a8298 Merge pull request #11306 from Aranclanos/hatlessdog
Fixes a runtime caused when interacting with a hat-less Ian
2015-08-23 21:48:39 -05:00
Cheridan
f37e9873d1 Merge pull request #11307 from MrStonedOne/patch-31
Fixes spawn revenant triggering WAY too often.
2015-08-23 20:27:30 -05:00