d3athrow
26626a1aa0
Revert "The winter update, part 2"
2014-12-16 12:15:01 -06:00
d3athrow
1ddc92bd4a
Merge pull request #2173 from DeityLink/winter2
...
The winter update, part 2
2014-12-16 09:54:29 -06:00
d3athrow
cf5c95da46
Merge pull request #2153 from DeityLink/winter1
...
The winter update, part 1
2014-12-16 09:53:27 -06:00
ComicIronic
58b1575c34
Mechanic fixing.
...
PDA device analysers now work as expected.
Groundwork for fabricators ignoring design requirements, which general fabricators now do for chems.
Item designs based on existing designs now properly generate a plastic requirement.
Sped up the flatpacker a little to balance its costs.
2014-12-16 10:02:32 +00:00
DeityLink
4ae4a535bc
autoignition stuff for flora and gifts
2014-12-16 00:42:44 +01:00
ComicIronic
c9e270538f
Mechanic fixes.
...
System now in place for machines having access requirements. Not yet used.
CE given special device analyzer in his locker.
Autolathes will now not eat the scanner and can be scanned by it.
2014-12-15 22:11:30 +00:00
d3athrow
52ed27c732
Merge pull request #2198 from clusterfack/combat-drone
...
Combat Drones Rework + Fixes
2014-12-15 11:36:54 -06:00
clusterfack
669c04e03b
Changelog
2014-12-15 01:13:55 -06:00
clusterfack
312dd08a6e
Combat Drones Rework + Fixes
2014-12-15 00:55:47 -06:00
DeityLink
0ef404042b
gaaah
2014-12-15 03:57:50 +01:00
DeityLink
001529e1d0
winter fixes
2014-12-15 02:11:58 +01:00
d3athrow
62cfcf4b3d
Merge pull request #2193 from N3X15/beams
...
Fixed half of beamwalking
2014-12-14 17:19:38 -06:00
Rob Nelson
2f3dd089af
Fixed part of #2190
2014-12-14 13:31:34 -08:00
d3athrow
00b0bbdee2
Merge pull request #2191 from N3X15/beams
...
[HOTFIX] Fix beam recursion and some runtimes.
2014-12-14 14:21:00 -06:00
Rob Nelson
e831dfe218
Fix beam recursion and some runtimes.
2014-12-14 11:21:42 -08:00
d3athrow
9cb00be5c0
Merge pull request #2177 from clusterfack/doors
...
Mineral Doors Rework
2014-12-14 12:40:30 -06:00
clusterfack
59630a350e
Fixing up Mineral Doors Rework
2014-12-14 03:43:50 -06:00
clusterfack
03deba9796
Made mineral doors part of machinery/door
2014-12-14 02:40:51 -06:00
Intigracy
3a22731a68
fixes #1277
...
jensen jumpsuit inhand sprite
renamed the jensen icon_state in uniforms.dmi to jensensuit because I didn't want to bother going through the trouble of doing the python crap to edit the one in the inhand files from jensensuit to jensen instead.
2014-12-14 00:01:15 -08:00
DeityLink
bd5d9968a8
The winter update, part 2-2
2014-12-14 07:33:53 +01:00
d3athrow
ab061695a2
Merge pull request #2123 from N3X15/beams
...
[REDDY] BEEEAAAAMS (and atmos/supermatter fixes)
2014-12-13 21:41:43 -06:00
d3athrow
aee031920f
Merge pull request #2170 from Iamgoofball/patch-1
...
holy shit how high was i
2014-12-13 21:40:43 -06:00
d3athrow
7c9d32d1e6
Merge pull request #2171 from Intigracy/janitorbucket
...
Gives janiborg a bucket, so it can actually use that mop it has.
2014-12-13 21:40:19 -06:00
Rob Nelson
0c93275126
Fix conflicts because git is dumb
...
Conflicts:
code/game/gamemodes/cult/cult.dm
code/modules/mob/living/living_defines.dm
2014-12-13 19:18:52 -08:00
Intigracy
e4b8d958b3
Gives janiborg a bucket, so it can actually use that mop it has.
2014-12-13 17:41:16 -08:00
Iamgoofball
688065d63e
holy shit how high was i
...
jesus christ
2014-12-13 17:12:05 -08:00
ComicIronic
dcc67a2a0f
Changes the way radio say code is called.
2014-12-13 20:38:01 +00:00
DeityLink
b2ae754aca
Merge remote-tracking branch 'origin/winter1' into winter2
2014-12-13 20:39:24 +01:00
d3athrow
5b67e92792
Merge pull request #2147 from ComicIronic/FlameThrows
...
Flamethrower fixes.
2014-12-13 12:22:10 -06:00
DeityLink
ecb75b9fbf
all the seeds!
2014-12-13 17:14:50 +01:00
DeityLink
e1eb77a64b
The winter update, part 2-1
2014-12-13 17:12:59 +01:00
ComicIronic
80232b82ba
Fixes the case of the disappearing hatchet.
2014-12-13 14:10:48 +00:00
DeityLink
97370ee96c
might as well
2014-12-13 06:57:11 +01:00
DeityLink
5f1fc87dc7
spelling and list
2014-12-13 06:42:55 +01:00
DeityLink
d49c3b2138
more chicken recipes
2014-12-13 06:37:52 +01:00
DeityLink
d3d712b3c0
d-d-d-drumstick
2014-12-12 23:53:32 +01:00
DeityLink
cd43f63bdc
point taken
2014-12-12 21:06:12 +01:00
DeityLink
13dd1d0130
The winter update, part 1
2014-12-12 20:50:34 +01:00
ComicIronic
d5fffaa8b1
EOL.
2014-12-12 17:15:15 +00:00
Rob Nelson
56b6bee0a7
Fix bug with AAC supermatter integration.
2014-12-11 18:59:34 -08:00
Rob Nelson
6f84caacca
Constructable Prisms
2014-12-11 16:55:08 -08:00
Rob Nelson
c46cfeef7e
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into beams
2014-12-11 16:12:46 -08:00
wild-billy
bda6f69804
Merge pull request #2044 from DeityLink/Bleeding-Edge
...
the PDA and Desk Bell update (map changes included)
2014-12-12 01:55:02 +02:00
ComicIronic
32aa055e36
Flamethrower fixes.
...
Fuel now burns, even without an auto-ignition temperature, which was a silly way of doing things.
Mobs no longer ashify since their proc is changed.
Flamethrowers now spread more fuel and burn more consistently for it.
Atoms now have volatility, so they can burn more if they have less fuel.
2014-12-11 23:12:28 +00:00
Rob Nelson
7627588519
Fix compile, fix delamination announcements.
2014-12-11 15:09:01 -08:00
Rob Nelson
567c287b84
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into beams
...
Conflicts:
code/game/machinery/pipe/construction.dm
2014-12-11 14:10:59 -08:00
Rob Nelson
0abc116244
Pipe fixes, vent standardization, AI announce fixes.
2014-12-11 14:07:13 -08:00
Wild Bill
3e20da11e4
expanding map datum
2014-12-11 23:44:57 +02:00
Rob Nelson
78cc5074f0
Beams now have fractional damage.
2014-12-11 12:13:37 -08:00
DeityLink
fda86578f2
minimaps for box, deff, meta and taxi
2014-12-11 16:46:44 +01:00
