Commit Graph

123 Commits

Author SHA1 Message Date
Tigercat2000
288af9f92c Revert "Merge pull request #4739 from monster860/vg-parallax"
This reverts commit 451c934379, reversing
changes made to 64f26d999f.

Conflicts:
	SQL/paradise_schema.sql
	SQL/paradise_schema_prefixed.sql
2016-07-28 15:48:27 -07:00
monster860
b2cb87edc9 Merge branch 'master' into vg-parallax 2016-07-28 16:45:10 -04:00
Crazylemon64
27ee3c7247 It's re-entrant now 2016-07-04 14:52:19 -07:00
Crazylemon64
a44808f195 Final map tweaks 2016-07-03 17:17:56 -07:00
Crazylemon64
2c4d8e9b6a You can now load the cyberiad runtime-free 2016-07-03 15:36:38 -07:00
Crazylemon64
f2b48c7c67 You can now load the cyberiad with the map-loader 2016-07-02 22:50:45 -07:00
monster860
120e470458 Ports /vg/ parallax 2016-06-21 14:58:49 -04:00
Matt Milosevic
bc86a86ece Hopefully final 2016-06-08 18:30:26 +02:00
Matt Milosevic
84ec23b1d2 Back where we started... 2016-06-05 00:41:45 +02:00
Matt Milosevic
a162488f03 Totally refactors and updates the ruins code 2016-06-03 21:26:25 +02:00
Matt Milosevic
925d7a4d01 It works! Kind of. 2016-06-03 15:43:18 +02:00
Matt Milosevic
3dd8f1e34d Initial space ruins commit 2016-06-03 12:47:42 +02:00
Tastyfish
a0ad6582a1 Updates maploader code to be in line with tg's, startup improvements 2016-04-10 02:57:58 -04:00
Markolie
95fa836d68 Various fixes 2015-09-26 04:51:36 +02:00
Markolie
c5c64413a1 Pipenet overhaul 2015-09-21 02:11:54 +02:00
Markolie
aa9b5a6310 Implement /vg/'s global asset cache 2015-08-21 18:47:00 +02:00
Markolie
6c8efe9a9b Atmos --> Atmospherics 2015-08-20 20:08:58 +02:00
Markolie
4a0e02c4a8 Update start of game logging 2015-08-20 19:54:13 +02:00
Markolie
b1ed0bdef6 add config option to disable away missions, remove invalid AI name 2015-08-11 22:12:05 +02:00
Krausus
60fed2cf71 Resolves further merge conflicts 2015-08-03 23:40:28 -04:00
Markolie
73e94b5dc4 Alarm system overhaul 2015-08-02 07:13:03 +02:00
DZD
6180243d65 Minor changes
- Changes asteroid wall sprites.
- Gives miners a styptic patch.
- Removes code that was previously commented out related to the
stationary mining drills.
2015-07-28 13:07:24 -04:00
Krausus
c520ebd8a5 Process and Process Scheduler Tweaks 2015-07-18 13:14:32 -04:00
DZD
29e70854e9 Fix merge conflicts
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
2015-07-15 22:28:12 -04:00
Fox-McCloud
f5ce957f33 qdel pass II 2015-07-11 02:10:31 -04:00
DZD
916f9bf4bb Sort of compiles
Time to fix xenoarch, and then the map.
2015-07-09 15:55:36 -04:00
Krausus
b386cec388 Initial GC fixes/tweaks/cleanup/documenting 2015-06-27 01:56:57 -04:00
Tigercat2000
d7e9c36474 Clean up window coloring code a bit. Also makes windowspawners only create
windows where needed, not everywhere then deleting the ones it doesn't
want.
2015-06-18 19:58:08 -07:00
Tigercat2000
e1fad29990 Merge remote-tracking branch 'upstream/master' into SpaceCube
Conflicts:
	maps/cyberiad.dmm
2015-05-11 14:55:01 -07:00
Tigercat2000
d98bf2d958 Spacecube transitioning
This commit adds the spacecube system from -tg-. The spacecube system
allows for predicatably random space layouts- it is randomized every
round, but the transitions stay consistant for that round, therefore
making it possible to 'map' space, or explore in teams.
2015-05-11 12:43:10 -07:00
Tigercat2000
fd799d6844 Starlight
This commit ports baystation12's implementation of starlight, modified to
rely on the master-controller due to differences between us, -tg-, and
bay12. Starlight allows space tiles to give off light, the amount of light
can be configured in config.txt.
2015-05-10 18:31:21 -07:00
FalseIncarnate
db9d9fc647 Botany / Xenobotany Update
Largely a port of https://github.com/Baystation12/Baystation12/pull/8038
(Credit to Zuhayr for his hard work on botany)

Breakdown of the port:
- Plant traits have been expanded drastically
- You want a bio-luminescent tomato that explodes into a cloud of acid
when thrown or stepped on? Or maybe a corn vine that entangles people
and injects them with mannitol and it's harvests that can be used as a
battery? Totally possible.
- Adds new random seeds! Replaces the egg-plant seed in the exotic seeds
crate from cargo with 2 of these.
- Literally random, they have randomly generated stats, chemicals, and
traits. Great for researching, and/or wasting cargo's supply points.
- Plant analyzers can now print off the last scan they recorded, meaning
you can distribute copies of the report to validate your claims of
having the dankest weed on station.
- Potatoes, carrots, watermelons, soybeans, and pumpkins can all be
sliced/diced/carved with ANY sharp object, such as knives, hatchets,
glass shards, and e-swords.
- This should give the chef a bit more room to make it look like he
actually is doing the work by slicing up fries by hand. The processor
still also works.
- New reagent: Wood Pulp
- Currently has no use in recipes, but any plant with this reagent in it
can be chopped into planks with a hatchet. Did someone order some
Ambrosia Deus planks?
- Also, vines with woodpulp are dense. You have been warned.

Now onto the stuff I did in addition to the stuff from Bay.
- Fixed typos where plasma was mistakenly called "phoron" in the port.
(Sorry bay)
- Replaced bay's botany mutation chances with our tiered mutation
system.
- Re-re-added tobacco, space tobacco, tea aspera, tea astra, coffee
arabica, and coffee robusta.
- Re-enabled the rolling of joints
- Made it possible to hand-roll cigarettes from tobacco / space tobacco.
(A requested / promised addition)
- Just like with joints, it will inherit any chems in the tobacco, has
the same reagent capacity as a joint, but looks and smokes like a cig
(lasts as long as the cigarettes) with a different name/description to
differentiate it from pre-made cigs.
- Corn can now be juiced in the grinder, in addition to grinding it.
Grinding corn will result in it's contained reagents (like corn starch),
while juicing corn will result in corn oil.
- Re-added the additional plant analyzer information when scanning trays
(displays age, weed level, etc)

Also cleaned up the recipes_microwave.dm file, removing the commented
out recipes that were distributed to the other machines during the
Kitchen Overhaul. Shortens the file a bit and makes it more readable.

I probably forgot stuff, so I will add things as I remember them / they
get pointed out.
2015-05-09 06:00:24 -04:00
Tigercat2000
4f1053f5b7 LINDA, Stage 1
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.

The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
2015-04-28 08:43:42 -07:00
ZomgPonies
710d60abda GC fixes 2015-02-25 10:58:56 -05:00
ZomgPonies
5c14d9c5f2 vg Garbage Collector 2015-02-23 17:18:38 -05:00
ZomgPonies
2c50a42ba7 Goon process scheduler 2015-02-22 15:24:46 -05:00
Markolie
86dd7782d5 Add cyborg latejoining 2015-02-05 14:27:39 +01:00
Bone White
30109587ed Singularity re-start fixes
1) Fixes an exception which prevented singularity generators from
spawning a singularity if they had fingerprints on them
2) Fixes an exception which was called on machineryprocess on the
deleted singularity generator

NOTES

For some obscure reason, hidden fingerprint logging on machinery does
not create a list if there is only one entry.  I couldn't find why, so I
wrote code to account for either a string or list for the singularity
generator ONLY.
2015-01-28 03:57:39 +00:00
Markolie
956f2ba703 Event overhaul from Bay, atmos fixes 2015-01-21 23:05:59 +01:00
Markolie
e59a94a8a1 Constructable newscaster, labor camp overhaul, other fixes 2015-01-16 21:50:33 +01:00
Markolie
c70a6c172b Away mission port from /tg/ 2015-01-09 00:12:16 +01:00
Markolie
b21575f088 Bot port from /tg/ 2014-12-02 17:59:40 +01:00
ZomgPonies
b33df4745c Removed deprecated power generation stuff (AM, RUST) to free up more procs 2014-07-25 11:33:37 -04:00
Zuhayr
ebb9f724aa Hydroponics rewrite, details will be in PR. Big commit.
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm
2014-07-25 11:10:01 -04:00
ZomgPonies
aafa11712a Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed! 2014-07-16 00:53:08 -04:00
Zuhayr
333c3c8ae7 Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.
Conflicts:
	baystation12.dme
	code/modules/admin/admin_verbs.dm
	maps/tgstation2.dmm
2014-07-13 08:44:47 -04:00
ZomgPonies
76276ace29 Cleaning out old unused code. 2014-07-13 08:10:44 -04:00
mwerezak
eb86081165 Adds direction arg for area/move_contents_to()
Attempts to fix shuttle corner transition effect
Fixes bad ETAs appearing on status displays

Conflicts:
	code/modules/shuttles/shuttle.dm
	code/setup.dm
2014-06-24 07:26:03 -04:00
mwerezak
e6944b989c Adds shuttle controller
Moves all ferry shuttle processing into one place: the new shuttle
controller.

Also cleans up the emergency shuttle controller a bit more and fixes
multi-shuttle cooldown.

Conflicts:
	code/controllers/master_controller.dm
	code/controllers/verbs.dm
	code/game/supplyshuttle.dm
	code/modules/shuttles/shuttle.dm
2014-06-24 07:06:48 -04:00
mwerezak
723979115c Renames supply controller global var
Renamed from 'supply_shuttle' to 'supply_controller'

Conflicts:
	code/controllers/verbs.dm
	code/game/gamemodes/gameticker.dm
	code/game/supplyshuttle.dm
2014-06-19 09:52:35 -04:00