d3athrow
8c95a75f82
Merge pull request #2291 from ComicIronic/MiningPicks
...
Added inactive hand mining bump checks.
2014-12-20 18:26:08 -06:00
d3athrow
8abf3b956c
Merge pull request #2261 from clusterfack/ore
...
Small Fixes
2014-12-20 11:00:21 -06:00
ComicIronic
05ffbb4db2
Inactive hand.
2014-12-20 11:42:53 +00:00
d3athrow
0cc6307323
Merge pull request #2189 from ComicIronic/MiningPicks
...
Mining pick code cleanup
2014-12-19 16:56:09 -06:00
clusterfack
4107adab84
Gave Strange Rock Own Class, Not an Ore
2014-12-17 11:37:13 -06:00
d3athrow
26626a1aa0
Revert "The winter update, part 2"
2014-12-16 12:15:01 -06:00
DeityLink
875ae68af9
Fixed station alert computers
2014-12-15 22:26:14 +01:00
ComicIronic
bcc3101855
Fix Gibtonite passive sprite.
2014-12-14 21:54:44 +00:00
ComicIronic
2fc025191a
Fixed wall code.
2014-12-14 21:16:56 +00:00
ComicIronic
7efc5b05d5
Mining code cleanup.
2014-12-14 17:40:31 +00:00
DeityLink
e1eb77a64b
The winter update, part 2-1
2014-12-13 17:12:59 +01:00
SkowronX
1af100afd6
four twenty yolo
2014-12-06 20:56:36 -06:00
clusterfack
affc5f216a
Rglass-3
...
Changing rpglass references
2014-11-30 21:22:04 -06:00
Rob Nelson
16a68c7ccf
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into slag-fixes
2014-11-05 13:36:17 -08:00
Rob Nelson
d31ea41dcf
More fixes.
...
* Slag now processed in recycling correctly.
* Slag puddles with no materials in them have the same melting point as plastic.
* Ore Redeemer skips slag.
2014-11-05 13:32:01 -08:00
Rob Nelson
5fa7270669
Slagging fixes.
...
* Slag now properly displays that it has content.
* Worthlessness is red.
* Smelting furnaces give minerals to slag.
* Drink glasses and bottles melt properly.
2014-11-03 15:02:55 -08:00
Rob Nelson
dd9691bb54
Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into melting
...
Conflicts:
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/mineral.dm
code/setup.dm
2014-11-02 12:47:21 -08:00
Rob Nelson
fa3c1b0b6f
Coins, ores, slag now recyclable.
2014-11-02 00:16:03 -07:00
Chris
8a3e9b2428
Merge remote-tracking branch 'origin/Bleeding-Edge' into bay_hydro_port
...
Conflicts:
code/modules/projectiles/guns/energy/special.dm
maps/tgstation.dmm
2014-10-31 12:02:10 -05:00
Chris
fa47305796
Few fixes to my stupidity.
...
Fix mobs aggroing mechas and whatnot while in their lazarus capsule.
2014-10-30 10:04:03 -05:00
Chris
636f5f49b0
Trainer belt + changelogs
2014-10-29 20:52:01 -05:00
Chris
41b0ce9267
Fix #1388
2014-10-26 23:54:47 -05:00
Chris
71e8adf74e
Merge branch 'Bleeding-Edge' into bay_hydro_port
2014-10-21 09:43:22 -05:00
ComicIronic
7bb647c2b5
Bugfixes, runtime fixes, and relative pathing fixes to xenoarch and energy guns.
2014-10-19 23:15:07 +01:00
Chris
dff16798e2
Merge branch 'Bleeding-Edge' into bay_hydro_port
...
Conflicts:
code/modules/mob/living/carbon/brain/brain_item.dm
code/modules/reagents/reagent_containers/food/snacks/grown.dm
html/changelogs/.all_changelog.yml
maps/tgstation.dmm
2014-10-14 11:19:50 -05:00
Chris
512b106f0f
Bay hydroponics rewrite port, work in progress.
2014-10-05 02:25:37 -05:00
ririchiyo
098ab2979e
Should be able to be compiled and tested now.
2014-09-28 11:30:42 -04:00
Chris
2420a5be4b
fukin mineturfs losing their data, regenerate it if it's missing.
2014-09-18 09:38:21 -05:00
Duny
23752dd32a
Cargo alarm unfucking attempt
...
Ore redemption machine isn't a hole mixing cargo's atmosphere with the
main hallway's anymore.
2014-09-16 06:48:09 +02:00
Wild Bill
3c8fd3dbec
Remove roundstart runtimes
2014-09-16 00:47:55 +03:00
Rob Nelson
9683ca0beb
Eliminate goon ores.
2014-08-15 19:36:29 -07:00
Rob Nelson
12eb139a78
Revert "Goonstyle fabricators, take 2"
2014-08-15 15:20:51 -07:00
Rob Nelson
6dc9aea2de
Merge pull request #1257 from Iamgoofball/butt
...
Goonstyle fabricators, take 2
2014-08-14 17:55:59 -07:00
iamgoofball
ecccb12d95
Merge branch 'Bleeding-Edge' of https://github.com/d3athrow/vgstation13 into butt
2014-08-14 12:08:43 -07:00
dylanstrategie
c4e6b09f42
Setting both consoles back to set.machine
...
On request of N3X15
2014-08-14 16:51:39 +02:00
dylanstrategie
cd45a50405
Fixed typo
2014-08-13 20:22:46 +02:00
dylanstrategie
f0c992e5fd
Fixes to Mining and Research Shuttle
2014-08-13 20:16:25 +02:00
iamgoofball
fc507139a0
Ore fixes
2014-08-12 14:03:00 -07:00
iamgoofball
bf1e2b53a9
whoops
2014-08-11 16:05:50 -07:00
iamgoofball
4d0a0beb86
Goonstyle fabricators, take 2
2014-08-11 15:55:46 -07:00
iamgoofball
0bd4928f53
Merge branch 'Bleeding-Edge' of https://github.com/d3athrow/vgstation13 into butt
...
Conflicts:
icons/obj/items.dmi
2014-08-10 20:48:25 -07:00
dylanstrategie
4dd76b3ab8
Updating computer luminescence
...
- Less shit that glows the wrong color or glows when it shouldn't
- More shit that glows when it should
- Any machine that brightens up when stuff goes in (cloner, cryo, DNA
modifier) now only fucking glows when stuff is in
- It still glows in full day light, but whatever
2014-08-10 19:08:14 +02:00
iamgoofball
689426defd
fixes, DON'T MERGE THIS YET
2014-08-09 22:06:13 -07:00
iamgoofball
cda6160207
Goon-style Ores, committed for N3X15 to look at.
2014-08-09 21:38:51 -07:00
d3athrow
afdd063246
Simple animal attack logs and fixes.
2014-07-29 08:45:41 -05:00
d3athrow
b1006601a9
NanoUI fixes from bay and crewmonitor now has a station map so you can easily locate people.
2014-07-19 11:00:08 -05:00
d3athrow
d170c108ce
Runtime fixes
2014-07-09 12:39:58 -05:00
ESwordTheCat
337bc83e0d
Add these changes from WIP force merge of it.
2014-06-26 06:52:56 -08:00
ESwordTheCat
95377e9c6d
Fix artifact spreading and large scanner. Remove extra list used the master_controller var again.
2014-06-19 07:16:15 -08:00
ESwordTheCat
da50671dc7
I accidentally math.
2014-06-17 06:04:17 -08:00
