Commit Graph

28 Commits

Author SHA1 Message Date
bawhoppen
96fd665676 honk 2016-03-25 23:12:44 -05:00
Lularian
2b700895a8 swat stuff 2016-03-25 22:48:38 -05:00
Remie Richards
496190a4e2 Updates the prices of Bee crates, due to Goofcargo thinking big numbers is ~more fun~ or something. 2016-03-25 14:47:36 +00:00
Remie Richards
b9a2c7fdfe Merge branch 'master' of https://github.com/tgstation/-tg-station into BEES_glorious_BEES
Conflicts:
	icons/mob/head.dmi
2016-03-23 15:41:58 +00:00
AndrewJacksonThe2nd
d70279e203 Merge branch 'master' of https://github.com/tgstation/-tg-station into goon_port 2016-03-22 16:13:17 -07:00
Remie Richards
be0b16a6aa Reagent Bees! Bees come from a beebox and pollinate nearby hydroponics plants, improving the health/yield/removing pests from the plants. While pollinating they build up resources to build honeycomb, honeycomb contains honey (a mild healing reagent that is very nutritious) any spare resources (50 bee_resources) are converted into new bees. honeycombs can be ground up to get the honey and other reagent inside them in an All In One Grinder.
Beeboxes have honey_frames which determine the amount of honeycomb+bees they can maintain.
Bees now have a beegent (Bee reagent, geddit?) that they use during their attacks AND that their produced honeycomb contains, this allows you to farm chemicals using bees.
2016-03-21 04:51:16 +00:00
c0
ed8239d840 Wall mounted flashes are now buildable 2016-03-12 15:14:48 +03:00
AndrewJacksonThe2nd
480583da32 Merge branch 'master' of https://github.com/tgstation/-tg-station into goon_port
Conflicts:
	code/modules/cargo/packs.dm
2016-03-04 23:41:48 -08:00
AndrewJacksonThe2nd
afd0a20432 Goon Port #1: Stock Market 2016-03-04 20:39:27 -08:00
c0
a690abcf92 Plant Refactor: Seeds 2016-03-04 02:35:51 +03:00
Bjorn Neergaard
8e1ec7c2b8 Properly check supply packs validity 2016-02-28 20:26:04 -06:00
tkdrg
bc5c023883 Merge pull request #15809 from bgobandit/bettercontraband
Makes contraband crates great again.
2016-02-28 23:13:55 -03:00
bgobandit
5127ba71fc reverts name change, tweaks cost 2016-02-28 11:01:30 -05:00
bgobandit
7af3e2ce1d oops 2016-02-27 20:15:49 -05:00
bgobandit
6b5379f053 Adds items to contraband crate. 2016-02-27 20:14:16 -05:00
AnturK
b444f4f5da Fixes shuttle loan events not creating crates. 2016-02-27 17:49:09 +01:00
Bjorn Neergaard
27a838c17f Fix crate access; fix locker item-to-lock 2016-02-10 17:40:10 -06:00
Bjorn Neergaard
39421efeb3 Address feedback 2016-02-08 07:22:18 -06:00
Bjorn Neergaard
fd5b61a156 Implement robust cargo logging 2016-02-08 04:28:19 -06:00
Bjorn Neergaard
f19feb4505 Remove dupe file, remove colon cancer and add prespawned stacks 2016-02-08 01:16:30 -06:00
Bjorn Neergaard
4ef2667ff2 Rewrite supply packs/cargo orders 2016-02-07 04:45:55 -06:00
Bjorn Neergaard
ddab6823d3 Fix up crates
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
2016-02-07 01:20:37 -06:00
Bjorn Neergaard
ede93b63a6 Put shuttles in their proper place, split out secure crates 2016-02-07 01:18:56 -06:00
Bjorn Neergaard
6f05af73a3 Fix shuttles not correctly buying/selling
Empty crates are now sold properly, as well as being sold
only when centcomm is reached
2016-02-06 02:01:38 -06:00
Bjorn Neergaard
b9c79680b9 Rename get_ui_data -> ui_data, remove useless shuffle from wires 2016-02-05 17:09:40 -06:00
Bjorn Neergaard
46fe1f82a5 Factor out filter to be more generic 2016-02-05 17:06:07 -06:00
Bjorn Neergaard
9386602acf tgui cargo console
rewrite awful shuttle/cargo code a lot as well
2016-02-05 17:06:07 -06:00
Bjorn Neergaard
9783f47514 Centralize shuttle computers 2016-02-05 17:06:04 -06:00