4e644df7cc
Runtime fix
2015-09-24 16:17:37 -05:00
b1185747bb
Fixes
2015-09-24 12:55:54 -05:00
d3aa84e978
Merge pull request #11937 from KorPhaeron/profligateslikeyoubelongonthecross
...
Hanging any mob from the kitchen spike
2015-09-24 02:14:06 +03:00
1105a2b820
Merge pull request #11899 from kingofkosmos/altclickrotatepipe
...
Alt-click to rotate stuff
2015-09-24 01:59:04 +03:00
4a99082cf6
Merge pull request #11888 from KorPhaeron/toolboxcrusaders
...
Guardian Changes
2015-09-24 01:46:59 +03:00
f8e2f721c3
Merge pull request #11877 from Core0verload/suicide
...
Russian roulette: "Spin the chamber" edition.
2015-09-24 01:44:12 +03:00
b2e42f518d
Merge pull request #11876 from Aranclanos/beaker
...
Adds a qdel check for when the beaker spills their reagents on the tu…
2015-09-24 01:43:03 +03:00
78e9fe068f
Merge pull request #11782 from Jordie0608/bagsofholdingsarejustincompletesingularitygrenades
...
Rework of adv egun failure mechanic
2015-09-24 01:34:38 +03:00
3d69d48c18
Merge pull request #11940 from Steelpoint/BiosuitSec
...
Security Biosuit Sprite/Armour Change
2015-09-24 01:24:31 +03:00
d6779855c1
Merge pull request #11946 from Lijah99/ACTUALLYFixesVehicleFootprints
...
ACTUALLY fixes footprints while in a vehicle/buckled
2015-09-24 01:22:49 +03:00
c410d1680d
Fixes brains sharing their dna with another carbon, which causes runtimes when the carbon and its dna is deleted.
2015-09-23 23:05:26 +02:00
e9bed91a1e
Merge pull request #11925 from Core0verload/matter-final
...
Materials - final solution
2015-09-23 21:11:17 +03:00
c11edd8418
Butcher update
2015-09-23 12:30:56 -05:00
b0a89af2c6
Left a line in the wrong place
2015-09-23 01:16:30 -05:00
29e1858fcf
New sprites
2015-09-22 23:53:26 -05:00
f16b4e1903
Merge remote-tracking branch 'tgstation/master' into toolboxcrusaders
2015-09-22 23:41:02 -05:00
8a71d3e875
Merge pull request #11809 from Xhuis/even_better_than_a_mass_emagger
...
Uplink rebalance
2015-09-22 23:40:18 -05:00
a5d7ae8d92
Merge branch 'master' of https://github.com/tgstation/-tg-station
2015-09-23 03:24:17 +03:00
e5296ffa7d
AnturKs fixes without mutation fix
...
AnturKs fixes without mutation fix
2015-09-23 03:21:00 +03:00
cbed291596
Merge pull request #11892 from Aranclanos/tempvent
...
Fixes the alien infestation event not triggering
2015-09-22 16:27:09 -05:00
d515d55558
ACTUALLY fixes footprints while in a vehicle/buckled
2015-09-22 15:17:04 -06:00
6711406d6a
Conflicts 2/3
2015-09-22 16:37:00 -04:00
835da91620
Merge pull request #11883 from phil235/DnaMonkeyStuff
...
DNA rework
2015-09-22 18:43:27 +03:00
cca48e61f1
SecBioSuit
2015-09-22 23:17:49 +08:00
42352e915b
Buckling fixes
2015-09-21 23:13:02 -05:00
01c362f069
Merge pull request #11757 from Xhuis/side_antagonist_tweaks
...
Side Antagonist Tweaks
2015-09-22 12:26:00 +10:00
66f67946ae
Merge remote-tracking branch 'remotes/upstream/master' into airlock_charge_buff
2015-09-21 22:18:24 -04:00
2fd2f96238
Simplified update_mutations_overlay(), we no longer rebuild the entire mutation layer with all mutations every time we get or lose a mutation. I reintroduced in on_acquiring and on_losing some code similar to the old lose_indication gain_indication procs.
...
Fixed lesser form changeling, when humanized via dna injector, the ling no longer keeps its Human Form power.
Simplified the racemut trick in humanize() and monkeyize().
Dna now gets qdel'd, just like reagents, when the mob gets qdel'd.
Some tiny fixes here and there.
Added a changelog.
2015-09-22 02:14:37 +02:00
2d872ac8b4
feedback
2015-09-22 00:20:37 +03:00
93fb95993e
Instant merge is the fastest action type for this operation
2015-09-22 00:20:36 +03:00
ef8bb5e0e0
Russian roulette
2015-09-22 00:20:36 +03:00
8d54f835ae
Materials - final solution
2015-09-22 00:18:37 +03:00
836c31ac83
Merge pull request #11845 from xxalpha/nanites
...
Added a self-repair module for cyborgs.
2015-09-21 22:06:45 +03:00
5f8318de85
Merge pull request #11875 from Aranclanos/adminfollow
...
Removes a sleep in the admin follow command.
2015-09-21 21:59:38 +03:00
9c221f47af
Nerf teleport attack
2015-09-21 09:07:16 -05:00
903c041279
Slightly less damage for the punchghost
2015-09-21 03:23:23 -05:00
451caf6bd5
Holoparasites is a dumb name
2015-09-21 03:15:03 -05:00
550697318d
Chaos Fixes
2015-09-21 03:11:05 -05:00
1d9c61702d
Merge branch 'master' of https://github.com/tgstation/-tg-station into bagsofholdingsarejustincompletesingularitygrenades
...
Conflicts:
code/modules/projectiles/guns/energy/nuclear.dm
2015-09-21 17:00:08 +10:00
6e117f031e
Merge pull request #11837 from Steelpoint/GunSprites
...
Auto Rifle Sprites and Bug Fixes
2015-09-21 03:23:22 -03:00
422f7ecfe5
Fix
2015-09-21 10:25:27 +08:00
2f9a37d624
Changes
2015-09-21 10:21:10 +08:00
2c2af6c634
Limit
2015-09-20 21:00:17 -05:00
74c3df9683
Holoparasites
2015-09-20 14:37:41 -05:00
4a34f42a0a
Give Syndiborgs more stuff
2015-09-20 14:38:25 -04:00
1a5df1d08b
Merge pull request #11846 from GunHog/RadsPlzKThxLol
...
Advanced Energy Gun fixes
2015-09-20 20:36:17 +02:00
225eee3d2f
Merge pull request #11815 from spasticVerbalizer/shootFooting
...
Makes clumsy misfires actually target a leg
2015-09-20 17:24:24 +01:00
979ae3ade6
Cleans up heart eating code
2015-09-20 12:01:50 -04:00
65c516607f
Adds altclick rotation + description to doppler array, transit tubes, windoor assembly, infrared emitter, emitter, particle accelerator, disposal tubes.
2015-09-20 18:54:23 +03:00
9cfdb75295
Merge pull request #11852 from Xhuis/cult_update_update
...
Cult Refactor Update
2015-09-20 17:53:35 +02:00
KorPhaeron