Commit Graph

91 Commits

Author SHA1 Message Date
Fox-McCloud
54f59b9899 Pass II 2015-07-09 19:51:40 -04:00
Fox-McCloud
0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud
cf6b4b0bb9 removed blood destroy 2015-07-08 01:50:22 -04:00
Fox-McCloud
9dc27ce126 Destroy Pass II 2015-07-07 22:26:28 -04:00
Fox-McCloud
88dfaa51a4 Replaces Reamining Del()'s 2015-07-07 00:35:19 -04:00
Tigercat2000
82f6855755 Initial Compiling port of MetaStation 2015-06-04 09:12:37 -07: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
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
df94ccb855 fix for infinite explosions 2015-04-17 23:07:22 -04:00
Fox-McCloud
33233941d5 [Goonchem] Reagent Decals 2015-04-17 18:27:49 -04:00
Fox-McCloud
7c739e4745 Merge pull request #710 from ZomgPonies/limb
Port of the BS12 limb overhaul
2015-04-05 19:06:39 -04:00
SamCroswell
8485ae4bab Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into PosterUpdate 2015-04-04 23:05:18 -04:00
SamCroswell
57703695ed Poster Rework Part 3 2015-04-04 23:04:45 -04:00
ZomgPonies
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
SamCroswell
98fd743f6d Adds Poster Supply Packs 2015-04-03 17:15:07 -04:00
SamCroswell
c6f5f1f8cd Poster Update 2015-04-03 16:45:44 -04:00
Fox-McCloud
ff5ec1df54 meh 2015-04-03 05:32:53 -04:00
Fox-McCloud
3bcbd2488c [Goonchem] Few New Reagents 2015-04-02 05:04:20 -04:00
Fox-McCloud
4e4e7ae77f Crayons and Gloves 2015-03-06 21:40:57 -05:00
ZomgPonies
8a575700b9 Finally got colored blood working properly 2015-03-03 13:45:46 -05:00
ZomgPonies
f27ccb6f4d Owlman/Griffin toys/posters/barsign 2015-02-27 13:24:45 -05:00
Markolie
672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Markolie
042ac20d5e Remaining 3 /tg/ away missions 2015-01-11 07:41:12 +01:00
Fox-McCloud
fece84d974 Fixes-Tweakes 2014-12-14 03:18:10 -05:00
SamCroswell
d23578525d NeinHaus' warning stripe icons
Adds NeinHaus' warning stripe icons as a child of the warning stripe
object, when mapping, if at all possible, please use these instead of
the turfs that come with them already on it, as these will merge with
the turf at runtime, and are more flexible.
2014-12-06 11:49:58 -05:00
SamCroswell
07435d52d1 Revert "NeinHaus' warning stripe icons"
This reverts commit a6a1ac9dc4.
2014-12-06 11:49:45 -05:00
SamCroswell
a6a1ac9dc4 NeinHaus' warning stripe icons
Adds NeinHaus' warning stripe icons as a child of the warning stripe
object, when mapping, if at all possible, please use these instead of
the turfs that come with them already on it, as these will merge with
the turf at runtime, and are more flexible.
2014-12-06 11:48:20 -05:00
Markolie
7e98ba2abe Poster ripping fix, allow access to air alarms when set to auto 2014-12-01 23:11:10 +01:00
SamCroswell
a860241f96 Rigged up unused warning stripe decals, we no longer require specific turfs for warning stripes. 2014-08-01 09:57:57 -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
ZomgPonies
9b1247a21c Fixes blood on wheelchair 2014-07-13 06:47:05 -04:00
cloroxygen
c8b1fd08de 21 viro symptoms
Im an idiot that cant use github edition

Conflicts:
	code/game/objects/effects/decals/Cleanable/humans.dm
	code/modules/virus2/effect.dm
2014-05-17 19:17:35 -04:00
d3athrow
19d339c45d Furthur optimizing qdel and Destroy for obj/effect
Conflicts:
	code/game/objects/effects/decals/Cleanable/humans.dm
2014-03-05 20:26:40 -05:00
ZomgPonies
1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
ZomgPonies
acb3f37c1b vg's likely superior bot code. 2014-01-13 04:24:16 -05:00
Rob Nelson
d3c4f0a5e7 New posters from BS12, plus custom poster-loading system that allows dynamic loading.
Conflicts:
	baystation12.dme
	code/game/objects/effects/decals/contraband.dm
	html/changelog.html
	icons/obj/contraband.dmi
2014-01-12 03:45:32 -05:00
ZomgPonies
24dceac4ef Compile fix 2014-01-11 21:07:13 -05:00
Rob Nelson
92722efe15 Fixed #395: Cut down posters can't be replaced.
Conflicts:
	code/game/objects/effects/decals/contraband.dm
2014-01-11 20:46:29 -05:00
Rob Nelson
5a061d770f Fix #381 - Poster duping 2014-01-10 02:04:20 -05:00
Mloc-Argent
4e7feaf624 More elegant solution to dirt getting in the way.
Who needs to click dirt anyway?

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/decals/Cleanable/misc.dm
2014-01-08 18:40:00 -05:00
Ccomp5950
0c5cff952e Dirt Fixes. Pass ALL the attack_by's to the floor.
Conflicts:
	code/game/objects/effects/decals/Cleanable/misc.dm
2014-01-07 05:45:26 -05:00
ZomgPonies
38682de629 Adds ability to write on walls with blood 2013-12-28 11:08:52 -05:00
ZomgPonies
e71494f4cf New posters for the people! 2013-12-18 04:56:23 -05:00
ZomgPonies
859ed8bf38 Clown Planet V2 2013-11-20 21:47:00 -05:00
ZomgPonies
8a4ae68fc3 Update icon fixes 2013-11-03 04:07:45 -05:00
ZomgPonies
9806e5f73b Lessened bloodstain lag 2013-11-02 04:03:16 -04:00
ZomgPonies
2c0614d3af Replaces HasEntered() with Crossed() and reduces redundant checks on turf/Enter() 2013-10-28 06:45:15 -04:00
ZomgPonies
aa79d1323b Added Vox and Kidan as unlockable Karma species 2013-10-04 02:57:42 -04:00
ZomgPonies
853d490660 Various fixes. 2013-09-27 02:41:41 -04:00