Commit Graph

36 Commits

Author SHA1 Message Date
DeityLink
d6f10ed819 the Cinnamon and Prehistoric Plants update 2015-10-06 21:16:39 +02:00
d3athrow
6c0a35b638 Merge branch 'diona-nodes-fix' into 'Bleeding-Edge'
Goodbye Replicapod, Hello Dionanode

replaces the replicapod type paths with dionanode

* Diona Nodes finally have their own seed packet/plant sprites.
* Fixes #50

![dionanodes](https://gitlab.com/vgstation/vgstation/uploads/8ee552772bec43ccf17dee7432ee9fc3/dionanodes.png)

See merge request !155
2015-08-31 18:36:16 +00:00
Scott Taylor
f02164d860 Bug fixes and tiny tweaks. 2015-08-31 14:43:48 +10:00
DeityLink
92b2cfbf8b goodbye replicapod, hello dionanode 2015-08-30 19:19:36 +02:00
dylanstrategie
c6e238ec24 Revamp the Scoreboard 2015-08-06 23:08:47 +00:00
PJB3005
3bc5d86263 LIGHTING IS BACK.
AND A SHITLOAD FASTER.

SANIC.
2015-07-21 14:16:27 +02:00
D3athrow
d59f6a07b0 comment out panicwriter and saytesting 2015-07-20 16:04:48 -05:00
D3athrow
7a3ff4efc3 THE LIGHTING IS DEAD, LONG LIVE DAL 2015-07-18 23:05:18 -05:00
D3athrow
41d7df01fd just fuck my shit up 2015-07-18 02:30:51 -05:00
PJB3005
ae7ab25539 BAY LIGHTING PEOPLE 2015-06-06 22:15:21 +02:00
Probe1
31471f80cd Moved meatbread to bottom of list to stop it from interfering with xemomeatbread and spidermeatbread. Changed order of microwave ingredient labels on advice from Comic to be in line with new obj file. 2015-05-23 18:50:33 -04:00
D3athrow
9c21244617 REVERT GAS DATUMS UNTIL COMIC FIXES THE PERFORMANCE ISSUES: PLEASE WORK ON THE GASDATUMS BRANCH https://github.com/d3athrow/vgstation13/tree/gasdatums in the mean time. 2015-05-10 22:55:46 -05:00
ComicIronic
4d432e5240 Gas Datums
Moved gas_mixture gas numbers to a list which is connected to a global gas_datum list, like with reagents.
Modified some maths procs to be more sane, added adjust_gas and set_gas to help with processing.
Added a modular system for gas flags - gases can now be marked as fuel and oxidiser with a flag, logged with a flag, scanned with a flag, etc.
Changed scrubbers to use a list of scrubbing gases rather than a set of vars.
Made miners and xenoarch effects more sensible - they now produce gas by ID, not manually.
Made turfs' starting gases into a list, removed turf gas number vars.
2015-05-04 10:36:04 +01:00
DeityLink
d34e7273f5 typo 2015-04-23 12:48:01 +02:00
DeityLink
1bc755e8b6 Scoreboard Update 2015-04-23 12:07:14 +02:00
D3athrow
93d940605c fixes #3857 2015-04-12 18:50:46 -05:00
D3athrow
01d2471fc9 Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge
Conflicts:
	code/ATMOSPHERICS/pipe/pipe_dispenser.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/embedded_controller/embedded_controller_base.dm
	code/modules/mining/money_bag.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/rdconsole.dm
	code/modules/research/xenoarchaeology/machinery/analysis_base.dm
	code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
	code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
2015-04-12 16:40:59 -05:00
9600bauds
55d4b0a202 Porting over tg's seed extractor 2015-03-22 21:57:12 -03:00
9600bauds
8aec92a7c4 Remove sugar from cherries. 2015-03-20 12:35:25 -03:00
D3athrow
e8925c2a89 Try and figure out why diverge is returning a null seed datum. 2015-03-12 12:58:58 -05:00
TermedClepe
0a0a87d278 Doubles plant glow mutation related chances 2015-02-25 03:08:40 +01:00
D3athrow
ec9861a647 Fixes #3169 via Baystation12/#8201 2015-02-22 00:02:14 -06:00
D3athrow
8138857918 hydro fix 2015-02-13 13:39:11 -06:00
d3athrow
da2b32bc99 Merge pull request #2959 from 9600bauds/babbys_first_PR
Swaps around chemicals in Reishi and Liberty Caps
2015-02-12 22:07:24 -06:00
D3athrow
c4265a9c43 spoopy runtimes 2015-02-12 13:30:06 -06:00
9600bauds
8d83eaa92e Fixes chemicals in Liberty Caps and Reishi 2015-02-12 08:05:04 -03:00
D3athrow
ca1fc347ca I dont know if this is necessary as it showed up a few times. 2015-02-07 01:52:14 -06:00
ComicIronic
192bf04b85 Okay less chems. 2015-02-06 19:23:11 +00:00
ComicIronic
1d90ff971b Plastic changes.
Fixed the capitalisation that was pissing me off.
Made plastic plants give consistently more plasticide per plant.
This should double the average and make plastic slightly easier to make, as under #2777.
2015-02-03 21:55:08 +00:00
Vas
a579e443c1 Ambrosia fixes/balance 2015-02-01 13:40:59 +01:00
D3athrow
5167a0f3e7 Throw some shit at issues
Fixes #2687 plants if in space will use a default zero pressure, absolute zero gas datum for processing.
Fixes #2688 poppy's growth stage icons were not showing up properly.
2015-01-30 00:22:58 -06:00
d3athrow
f1644bb0af Runtime fixies 2015-01-29 18:44:36 -06:00
D3athrow
9563a3e337 Bayhydro changes. 2015-01-27 13:57:56 -06:00
SkowronX
1af100afd6 four twenty yolo 2014-12-06 20:56:36 -06:00
Chris
dbd9ff6fec It compiles! 2014-10-05 23:01:36 -05:00
Chris
512b106f0f Bay hydroponics rewrite port, work in progress. 2014-10-05 02:25:37 -05:00