Commit Graph

336 Commits

Author SHA1 Message Date
Tigercat2000
e1fad29990 Merge remote-tracking branch 'upstream/master' into SpaceCube
Conflicts:
	maps/cyberiad.dmm
2015-05-11 14:55:01 -07:00
ZomgPonies
303a664f78 Merge pull request #1000 from Fox-McCloud/species-touchup
Species Touchups
2015-05-11 17:06:52 -04: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
Fox-McCloud
1e32bd1205 Species Touchups 2015-05-10 17:19:22 -04:00
Tigercat2000
625dbb5295 Merge remote-tracking branch 'upstream/master' into LightShit
Conflicts:
	code/modules/hydroponics/trays/tray.dm
	code/modules/hydroponics/vines.dm
2015-05-10 13:56:28 -07:00
ZomgPonies
23b2fac794 Merge pull request #980 from FalseIncarnate/master
Botany / Xenobotany Update [Feature][Sprites]
2015-05-10 16:05:57 -04:00
Tigercat2000
e1249fc640 Lighting overhaul.
This commit overhauls the lighting system to Bay12 standards. It is better
in pretty much every way.
2015-05-10 12:03:27 -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
Fox-McCloud
a02f560711 [Goonchem] Cryox/Clonex Change 2015-05-08 18:32:00 -04:00
ZomgPonies
d106462fa5 Merge pull request #796 from TheDZD/shadowling
Port of /tg/station's Shadowlings [WIP]
2015-05-04 20:38:20 -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
DZD
8de0140dcc Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/setup.dm
2015-04-21 18:56:34 -04:00
Fox-McCloud
e8038738f6 Merge pull request #800 from ZomgPonies/shadow
Mutantrace update
2015-04-21 18:36:24 -04:00
Bram961
4950e9c59a Splitting the Ambience and background noise
Splits off Ambience sounds and the background "shipambience.ogg" under
two difrent buttons.
2015-04-19 13:29:27 +02:00
ZomgPonies
1be205df11 Shadowpeople update 2015-04-13 01:06:39 -04:00
DZD
00035a51f0 It compiles!
- Makes shadowlings compile, require snowflaking of a few things to the
human Life() proc due to how Bay species works.
- Renames monkeyizing var to notransform, as that's effectively what it
was used for, to prevent transformation. (/tg/ port)
2015-04-12 19:54:45 -04:00
DZD
0ab3a54fcb Copy-Paste Port of /tg/station's Shadowlings
Ports tgstation/-tg-station#8157

This won't compile, needs to be bugfixed and tested. The only reason I
am PRing  this right now is so that we don't have multiple people
working on the same thing.

@ZomgPonies This will require PROBABILITY SHADOWLING # to be added to
game_options.txt, and will likely require SQL database additions for the
BE_SHADOWLING antag preference.
2015-04-12 13:15:40 -04:00
ZomgPonies
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
Fox-McCloud
d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Fox-McCloud
abf409149d more tweaks and additions 2015-03-26 09:43:13 -04:00
Iamgoofball
e5264815ee GOONCHEM 2015-03-24 02:04:47 -07:00
Tigercat2000
76ffbbfd59 Massive spacepod construction overhaul by /VG/ 2015-03-23 02:36:49 +01:00
Tigercat2000
008cf4d365 Adds pref SOUND_HEARTBEAT 2015-03-17 17:30:28 +01:00
ZomgPonies
00902cf5a7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into plasma
Conflicts:
	icons/mob/suit.dmi
2015-03-08 17:47:32 -04:00
ZomgPonies
753d23c667 Fix type that screwed with removing plasma suits 2015-03-08 17:43:17 -04:00
ZomgPonies
17a9e38439 Merge pull request #511 from Fox-McCloud/Life-Proc-Work
Life Proc Changes--Cold Space and and Temp Handling
2015-03-06 12:54:42 -05:00
ZomgPonies
646ef4563e Removed old snowflake bloodcode references 2015-03-04 12:24:47 -05:00
Fox-McCloud
a911b53e8b Life Proc Changes--Cold Space and and Temp Handling 2015-03-04 05:42:12 -05:00
Markolie
6b70bfec74 NanoUI update 2015-03-01 04:22:12 +01:00
Markolie
004b365110 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/modules/reagents/reagent_containers/syringes.dm
2015-02-22 22:15:45 +01:00
Fox-McCloud
bea78f2432 Chemistry Tweaks 2015-02-22 15:05:15 -05:00
Markolie
72db213067 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/jobs/job/support.dm
	code/setup.dm
2015-02-22 19:12:11 +01:00
Markolie
982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
Markolie
3b072b5a62 Remove click delay from most things 2015-02-22 18:47:58 +01:00
ZomgPonies
bb620841a1 Merge pull request #375 from Fox-McCloud/Thickmaterial
Thickmaterial
2015-02-22 08:26:02 -05:00
ZomgPonies
54791c57b5 Emergency: Removing WHISPER disability which infinite loops 2015-02-21 12:35:06 -05:00
Fox-McCloud
2a1028324c Thickmaterial Flag 2015-02-21 07:26:25 -05:00
ZomgPonies
dd79cb9ef2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-02-20 19:26:30 -05:00
ZomgPonies
5ac15e63f2 Merge pull request #348 from Fox-McCloud/Tail-Wagging
Tail Wagging System
2015-02-20 19:19:15 -05:00
ZomgPonies
cfd9c09f0a Adds COMIC mutation and gives it to clown 2015-02-20 18:43:09 -05:00
Markolie
c89e3ac1eb Revert "Revert "Emergency communications hotfix""
This reverts commit 3ea36839a8.
2015-02-20 17:59:07 +01:00
Markolie
d8d1670b68 Revert "Revert "Saycode/language/species port from Bay""
This reverts commit d54579850c.

Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/modules/mob/living/silicon/pai/pai.dm
2015-02-20 17:46:35 +01:00
DZD
212ca5f5bd MERGE CONFLIIIIIICTS 2015-02-19 20:26:36 -05:00
ZomgPonies
d54579850c Revert "Saycode/language/species port from Bay" 2015-02-19 20:15:42 -05:00
Fox-McCloud
70a231f2dc Tail Wagging System 2015-02-19 19:41:40 -05:00
DZD
d0d6c8eebd Merge with upstream/master
Fixes merge conflicts.
2015-02-19 19:38:48 -05:00
ZomgPonies
043a5e0e31 Merge pull request #331 from Markolie/master
Saycode/language/species port from Bay
2015-02-19 19:07:25 -05:00
ZomgPonies
4be5819122 Merge pull request #339 from Fox-McCloud/Explosives
Chem Boom Nerf
2015-02-19 17:39:27 -05:00
Fox-McCloud
1812a36113 Chem Boom Nerf 2015-02-18 17:13:58 -05:00
DZD
4bcdb94a99 Merge with upstream/master
Fixes conflicts
2015-02-18 13:41:32 -05:00