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
d3athrow
59c03ba0da
Merge pull request #2225 from N3X15/fix-beams
...
Fix some beam bugs. Tested.
2014-12-16 09:49:40 -06:00
d3athrow
96ccb3a579
Merge pull request #2229 from ComicIronic/MecchaAccess
...
Mechanic fixing.
2014-12-16 09:49:23 -06:00
d3athrow
08052459e4
Merge pull request #2230 from ComicIronic/JaniPush#
...
Makes it possible to climb over vehicles
2014-12-16 09:48:54 -06:00
ComicIronic
588b882ad1
Made it possible to climb of vehicles.
...
They are now anchored.
2014-12-16 14:22:39 +00:00
ComicIronic
ee84380800
Vehicles are no longer anchored.
...
You can push and pull them now.
2014-12-16 11:06:03 +00: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
Rob Nelson
cf48027abe
Comment debugging
2014-12-15 22:31:55 -08:00
Rob Nelson
aa589914a6
Fix some beam bugs. Tested.
...
- Beams now properly affect blobs
- Fix glass doors blocking beams when closing.
2014-12-15 22:28:32 -08:00
DeityLink
59135f14b9
more again
2014-12-16 00:57:33 +01:00
DeityLink
4ae4a535bc
autoignition stuff for flora and gifts
2014-12-16 00:42:44 +01:00
DeityLink
f1050b0c85
fixing
2014-12-15 23:58:18 +01:00
DeityLink
f2b7f110b7
more
2014-12-15 23:31:09 +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
d3athrow
0834466607
Merge pull request #2199 from clusterfack/cult
...
Cult Objective Hotfix
2014-12-15 11:36:20 -06:00
ComicIronic
1ee3ebafe5
Readded security officer internals.
2014-12-15 16:42:57 +00:00
clusterfack
d78c071ae8
Properly uses num_players() and round()
2014-12-15 01:54:17 -06:00
clusterfack
786f7ed00c
Cult Objective Hotfix
2014-12-15 01:33:22 -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
824cdd4f89
duh
2014-12-15 02:24:39 +01:00
DeityLink
001529e1d0
winter fixes
2014-12-15 02:11:58 +01:00
d3athrow
0808ed4300
Merge pull request #2178 from dylanstrategie/Defib
...
Trying to address invisible defibs again
2014-12-14 17:20:54 -06: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
dylanstrategie
dbc141b427
Add suggestion, avoid hardcoding
2014-12-14 18:38:19 +01:00
DeityLink
9953544be3
merch computer sprite
2014-12-14 16:31:47 +01:00
clusterfack
36b2912595
Mineral Door Rework Final Fixes?
2014-12-14 05:22:11 -06:00
clusterfack
471d82e6f6
Mineral Door Rework Fixes-2
2014-12-14 04:13:41 -06:00
clusterfack
59630a350e
Fixing up Mineral Doors Rework
2014-12-14 03:43:50 -06:00
dylanstrategie
0f8ae8cc39
Trying to address invisible defibs again
...
- Fix mistake in update_icon() proc that caused the defib to stay
invisible when out of power
- Remove src. typecasting, formatting
- Try to clarify messages, notably since it leads to doctors believing
they are treating unrevivable bodies when the ghost simply didn't
re-enter body yet
2014-12-14 10:06:33 +01: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
Rob Nelson
9c8b384afc
[hotfix] Remove pipe bursting
2014-12-13 23:02:13 -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
be85b09003
Merge pull request #2168 from ComicIronic/PersonalLockers
...
Fixed personal locker issues.
2014-12-13 21:41:02 -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
1061488094
Fixed personal locker issues.
...
Personal lockers now use the proper attackby code for secure lockers.
This means their sprites update properly.
They also use a variant of togglelock, so there's less snowflake than before.
2014-12-14 00:36:49 +00:00
