Commit Graph

1616 Commits

Author SHA1 Message Date
ZomgPonies
c8f9aa0c33 Merge pull request #1140 from Fox-McCloud/tweaking-stuff
Tweaks and Fixes 2.0
2015-05-22 17:24:29 -04:00
ZomgPonies
2d1b8f422e Merge pull request #1128 from Fox-McCloud/LINDA-Fixes
More Linda Fixes
2015-05-22 17:22:20 -04:00
Fox-McCloud
db442b4486 RCD Fix 2015-05-22 16:55:41 -04:00
Fox-McCloud
1c1eec3210 Tweaks and Fixes 2.0 2015-05-22 16:29:12 -04:00
Krausus
f5a00dcc28 Fixes match attack proc and processing
Fixes their missing attack proc (used to light others' cigarettes) and
matches still processing (and creating hotspots) after being dropped.
2015-05-22 08:43:57 -04:00
Krausus
01b5f09b22 Fixes missing icon/description for used zipties 2015-05-22 08:10:30 -04:00
Fox-McCloud
0da9c966f0 More Linda Fixes 2015-05-21 19:33:54 -04:00
Tigercat2000
a8702efd6b BAYPORT: Duct Tape
This commit ports Duct Tape from bay, alongside a few other changes for
our own code.

Bay12 Features:
 - You can tape paper to.. anything basically, like a sticky note.

Changes from Bay12:
 - Tape is a stack now, and has 10 uses per roll.
 - The guitar recipe now calls for 5 pieces of tape.
2015-05-17 14:11:25 -07:00
Tigercat2000
e232eb447c Rename cigs_lighters.dm to cigs.dm, to reflect lighters being seperated 2015-05-16 05:44:22 -07:00
Tigercat2000
0996890e44 Merge remote-tracking branch 'upstream/master' into fluffclean
Conflicts:
	paradise.dme
2015-05-16 05:38:40 -07:00
Tigercat2000
9d91387473 Fluff item restoration - Flasks, Lighters
This commit readds every fluff lighter to a new lighters.dm file, as well
as moving every lighter into it. There are enough to justify seperating it
from cigs_lighters.dm. Fluff lighter paths have not been touched for
compatibility to the database and map.

This commit also readds the flasks, with the fluff paths removed.
2015-05-16 05:36:56 -07:00
ZomgPonies
59ed4f69ad Merge pull request #1080 from tigercat2000/WHYDOTHESEKEEPSWITCHING
FIX: Attack logs being backwards
2015-05-16 07:52:33 -04:00
Tigercat2000
b7e5aa5597 FIX: Attack logs being backwards
This commit fixes attack logs being backwards on some erroneous add_logs
arguments.

Things fixed:
 - Martial arts
 - EMP Flashlight
 - Defibrillator
 - C4
 - Handcuffs
 - Resonant Fields
 - Alien Larva attack_animal
 - Mobs being grabbed
2015-05-16 04:41:37 -07:00
ZomgPonies
6bfd92b16a Merge pull request #1061 from FalseIncarnate/wizard
Brooms, Stick-horses, and Flying Wizards!
2015-05-16 07:34:22 -04:00
Krausus
224f0ff1d9 Fixes soap cleaning runtime
If you tried to clean an atom with soap, and that atom was deleted
before you finished cleaning, the message attempting to display its name
would runtime.
2015-05-16 02:14:34 -04:00
ZomgPonies
b823f3a99d Merge pull request #1072 from Fox-McCloud/those-fixes
Fixes and Tweaks
2015-05-15 22:35:25 -04:00
Fox-McCloud
8a5e3663df Fixes and Tweaks 2015-05-15 21:58:24 -04:00
ZomgPonies
4ceb335a5e Snowflake fun removal 2015-05-15 15:36:39 -04:00
ZomgPonies
2c965aef08 Fixes reported issues. 2015-05-15 10:57:37 -04:00
FalseIncarnate
55087890de Brooms, Stick-horses, and Flying Wizards!
A port of https://github.com/d3athrow/vgstation13/pull/4377

![image](http://i.gyazo.com/dd415093be904dc9e5d40570598eddb9.gif)

Allows brooms to be wielded with 2-hands. Doing so places the broom
between your legs so you look like you are riding it.

You can also put a horsehead mask onto the broom to create a stick-horse
to ride. This can also be wielded, but will ALWAYS appear between your
legs.

And for the more magically inclined, wielding a broom or stick-horse (2
hands!) will cause you to ride it like a witch, giving you the ability
to bypass hazards such as tables and banana peels.
2015-05-15 03:52:36 -04:00
ZomgPonies
95b1c1d87c Adds two new event species 2015-05-14 22:30:38 -04:00
Tigercat2000
fab7c48428 Fluff item removal: Compile fix
This commit removes an istype check that was causing compile errors, and
actually adds the updated .dme
2015-05-13 05:29:05 -07:00
ZomgPonies
ed8e0c7581 Merge pull request #1018 from tigercat2000/OhMyLights
Add light color defs for more things
2015-05-13 08:06:14 -04:00
TheDZD
a30d5953dd Merge pull request #1017 from ZomgPonies/superfix
Couple of superhero fixes
2015-05-12 15:11:51 -04:00
ZomgPonies
bd71606cf6 Merge pull request #1010 from tigercat2000/GAAB
Generic Action/Action Button System
2015-05-12 14:35:36 -04:00
Tigercat2000
7d103f5bd5 Add light color defs for more things
This commit adds custom color definitions to almost every computer that
did not already have them. It also causes cigarretes to very dimly glow.

Also contains custom colors for candles, flashlights, and the mentioned
cigarretes.

Oh, and beepsky flashes red and blue now while in hunt mode. FTW
2015-05-12 05:27:28 -07:00
ZomgPonies
2a0dcedd64 Couple of superhero fixes 2015-05-12 08:10:04 -04:00
ZomgPonies
f22ae3acbe Merge pull request #998 from tigercat2000/LightShit
Baystation12's Lighting Overhaul
2015-05-11 17:06:30 -04:00
AnturK
568d289a67 Generic Action\Action Button System
This commit ports the GAABS from -tg-station13. The GAABS allows for
generic, movable, hud elements for spells, powers, and items.
2015-05-11 09:32:08 -07:00
Krausus
9d712fe623 Fixes pill bottles not grouping their contents 2015-05-11 09:11:11 -04:00
Krausus
65ce3e4c20 Fixes numbered contents grouping different things
Also fixes a runtime from the black powder fix. Whoops!
2015-05-11 08:53:14 -04:00
Tigercat2000
40bd004923 Merge remote-tracking branch 'upstream/master' into WeaponCleanup
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/hydroponics/trays/tray_tools.dm
2015-05-10 14:15:51 -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
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
Fox-McCloud
dbaf893fe6 Merge pull request #971 from Krausus/QuickDumping
Improved Dumping for Containers
2015-05-09 20:33:06 -04:00
Tigercat2000
595f24bd1b Cleanup /defines/ folder.
This commit removes code/defines/obj.dm and code/defines/obj/weapon.dm.
These files were only kept for legacy compatibility and do not fit into
the tree system at all. It doesn't even make sense since the base defines
are all that were in these, the actual code for the items was in the right
file.

Any new ports that use this file on a different codebase should be sorted
into the tree system anyways, new files if necessary. A giant defines
file is just wasting space and searching effort.
2015-05-09 16:06:59 -07:00
Krausus
6ef0c00921 Adds missing canmove check 2015-05-09 07:41:21 -04: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
Krausus
5567c99a44 Adds drag-drop emptying to all containers
Also, fixes several missing checks and a facing mistake.
2015-05-09 02:25:38 -04:00
Fox-McCloud
a02f560711 [Goonchem] Cryox/Clonex Change 2015-05-08 18:32:00 -04:00
TheDZD
6515b10ccc Merge pull request #963 from ZomgPonies/superhero2
Superhero Overhaul Part 2: Magnetic Boogaloo
2015-05-08 16:55:59 -04:00
Krausus
d8e6893e35 Improves dumping of "quick" containers
Allows all "quick" containers to be dumped into a disposal (click) or
onto a table (drag-drop).
2015-05-08 07:20:44 -04:00
Fox-McCloud
b20104b360 Various Fixes and Tweaks 2015-05-07 23:31:39 -04:00
ZomgPonies
d3a8caddbf Makes Owlman's belt reload every 60 seconds 2015-05-07 18:04:12 -04:00
Fox-McCloud
828e3c9927 Merge pull request #952 from ZomgPonies/superhero
Massive Superhero Update
2015-05-06 23:40:08 -04:00
ZomgPonies
31fc0d39a5 Final touches on superheroes 2015-05-06 23:26:33 -04:00
ZomgPonies
3503c285fa Add toolbelt with smokebombs and bolas to owlman 2015-05-05 20:48:27 -04:00
Fox-McCloud
cbb2b819fd Enables Bag Item Stacking 2015-05-05 17:29:03 -04:00
Fox-McCloud
5aada8a9a3 Merge pull request #906 from Krausus/NicotineAddiction
Cigarette Fixes/Tweaks
2015-05-02 23:29:49 -04:00