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
6f6744da33
Refactors healing simple animals with bruise packs.
2015-08-28 02:02:43 -04:00
d824f7b35f
Merge pull request #11382 from Ergovisavi/bot_swarm
...
Adds "Swarmers" - Simple mob side antagonist
2015-08-28 00:21:23 -05:00
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
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
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
3f6d9858c6
Merge remote-tracking branch 'tgstation/master'
2015-08-27 20:21:11 -04:00
4c47a7cf5e
Merge remote-tracking branch 'tgstation/master'
2015-08-27 20:02:02 -04:00
df9e581df0
Shadowling update 4
2015-08-27 19:29:33 -04:00
d54d4b3054
Assembly
2015-08-28 02:02:17 +03:00
8474086bce
Buttons and wall frames rework
2015-08-28 02:01:49 +03:00
99c84a79ea
fixes ablative reflect
2015-08-27 22:29:20 +02:00
f8f5f689d9
Gave engineering cyborgs permanent magboots effect.
2015-08-27 20:23:35 +01:00
b9db8ce854
A few qdel fixes.
2015-08-27 13:15:41 +01:00
62fa9a163c
interface for watchlist, improvements to memo, varedit, ban interfaces
2015-08-27 20:57:01 +10:00
19947d4fa0
Added qdel(wires) to a bunch of objects Destroy proc.
...
Return ..()
2015-08-27 11:10:58 +01:00
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
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
9c9bf4a858
Merge pull request #11393 from Ergovisavi/has_wumbo_gone_too_far
...
Fixes infinite wumbo-ing
2015-08-27 01:06:03 -03:00
4fe28339c5
Makes requested changes.
2015-08-26 18:37:14 -04:00
3278a3926b
Merge pull request #11358 from phil235/XenoFeatures1
...
Facehugger inhands, xeno tweaks, and monkey bugfixes
2015-08-26 07:52:31 -05:00
cc45babcc7
Removed Comment
2015-08-26 11:38:53 +02:00
38e6a09cf9
Merge pull request #11351 from Core0verload/nodirt
...
Removes dirt from walking on tiles
2015-08-26 06:27:31 -03:00
d9f816279b
Merge branch 'master' of https://github.com/tgstation/-tg-station into pipecleanup
2015-08-26 00:24:22 -06:00
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
6277a80cdb
-Fixes infinite wumbo-ing
2015-08-25 14:02:48 -07:00
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
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
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
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
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
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
0d1d321651
Fixes pugs not following their tail.
...
The staff of change won't create invisible pugs anymore, same with the experimentator relics.
Removes a leftlover pug typepath.
2015-08-25 05:28:58 -03:00
8a7c65817d
Fixes goat and cow milking, they were just simply not working.
2015-08-25 04:24:59 -03:00
2c56462e97
I sure do love me some copypasta
2015-08-24 22:45:37 -04:00
132adf3f00
adds silver sulf syringes instead of kelotane pills
2015-08-24 21:45:18 -04:00
ce8722b868
Fixes burn kits containing salicyclic acid pills.
2015-08-24 21:36:50 -04:00
da2e11fd92
Update tree.dm
2015-08-25 00:22:16 +02:00
bf1bd69288
Tweaks
...
Removed comment giving Phil his credit.
2015-08-25 00:10:33 +02:00
e4506d01e9
Air Feature
2015-08-24 23:58:48 +02:00
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
e65ddd0827
note ckey fix
2015-08-25 05:11:55 +10:00
5cecd7e9fe
Simplifies plasmavessel/on_life() a bit, and make xeno on weeds also heal clone damage.
2015-08-24 19:54:51 +02:00
5eab46f136
Damn spaces.
2015-08-24 17:51:55 +02:00
6ff1fa0f9a
Simplifications + Oxygen output corrected
2015-08-24 17:15:12 +02:00
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
227f8cf058
Merge pull request #11335 from phil235/DelToQdelBugFixes
...
Some bugfixes with qdel
2015-08-24 08:36:42 -05:00
de03b410f9
Trees Now Convert CO2
2015-08-24 15:10:04 +02:00
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
eaf4f6b33e
Merge pull request #11321 from Jordie0608/comebacktousrevenant
...
Stops mindless revenants from despawning
2015-08-24 13:39:45 +02:00
bgobandit
Cheridan
Ergovisavi
ExcessiveUseOfCobblestone
Xhuis
c0
AnturK
xxalpha
Jordie0608
Aranclanos
Oisin100
duncathan
phil235
phil235