Commit Graph

4188 Commits

Author SHA1 Message Date
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 1b9cd2dfe4 Merge pull request #999 from Fox-McCloud/hiding
Potted Plant Hiding
2015-05-11 17:06:40 -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
Krausus 64f39bb871 Fixes AIs and ghosts not being able to follow bots
This probably touches more files than it really should, but I can't
think of a better way to do it that isn't overhauling the saycode.
2015-05-11 06:38:14 -04:00
Tigercat2000 5ff292fe47 Flashlight icon fix
I left out an icon-updating line. Whoopsies.
2015-05-10 20:41:46 -07: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 6610e0965e Merge pull request #983 from tigercat2000/water_act
Water_act system - for all your watery needs
2015-05-10 16:14:55 -04: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 428dde8047 Potted Plant Hiding 2015-05-10 14:41:06 -04:00
Tigercat2000 b7b13f15a4 Merge remote-tracking branch 'upstream/master' into water_act
Conflicts:
	code/modules/mob/living/carbon/human/human_defense.dm
2015-05-10 05:41:52 -07:00
Tigercat2000 27442f9539 Water_act: Wetlevel for carbon mobs
All carbon mobs have a new variable called wetness, which is increased
upon water_act's that have a volume over 10, and is decreased every 22~
cycles of mob_master.

This variable currently does absolutely nothing but change their examine
text.
2015-05-10 05:39:26 -07:00
ZomgPonies 533841c0a5 Fixed mobs not taking damage from explosions 2015-05-10 00:19:28 -04:00
Fox-McCloud 0b66bf725f Merge pull request #979 from ZomgPonies/explosion
Ports VG's DeityLink's new explosion method
2015-05-09 23:42:02 -04: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
Tigercat2000 e33e658178 Water_act system - for all your watery needs
This is the first commit of the Water_act system for monkey cubes,
showers, and mobs. The idea of the system is to outsource the effects of
water to the object/mob being affected instead of a bunch of snowflake
code.
2015-05-09 05:43:47 -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
ZomgPonies 1029e9afe1 Ports VG's DeityLink's new explosion method 2015-05-09 01:56:25 -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
ZomgPonies 6b6ff9b10f Merge pull request #972 from SirBloodBuske/master
Intercom Frame Icon fix
2015-05-08 15:04:40 -04:00
SirBloodBuske a764cfdada Intercom Frame Icon fix 2015-05-08 05:49:22 -07: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
ZomgPonies d106462fa5 Merge pull request #796 from TheDZD/shadowling
Port of /tg/station's Shadowlings [WIP]
2015-05-04 20:38:20 -04:00
ZomgPonies 1fe9bf4a43 Merge pull request #928 from FreeStylaLT/notparadise2
Engineering/Atmos beret changes
2015-05-03 18:48:01 -04:00
Fox-McCloud 10422a855d Merge pull request #922 from SirBloodBuske/master
Intercom construction and Deconstruction.
2015-05-03 14:32:53 -04:00
Fox-McCloud 5aada8a9a3 Merge pull request #906 from Krausus/NicotineAddiction
Cigarette Fixes/Tweaks
2015-05-02 23:29:49 -04:00
Krausus c000cb4c78 Doubles cigar(ette) capacity, tweaks base nicotine 2015-05-02 23:08:17 -04:00
Krausus f6ad960f60 Allows synthetics to get reagents from cigarettes 2015-05-02 22:43:44 -04:00
SirBloodBuske d47a39a05a Fixing Intercom changes from VG Code to Paradise 2015-05-02 16:14:36 -07:00
FreeStylaLT c290b1471e Engineering berets changes
Adds in a REAL Engineering beret, renames the current one to "atmospherics
beret", they spawn in engineering and CE's lockers.
2015-05-03 01:41:42 +03:00
SirBloodBuske b63d1d0163 Adding Intercom to recipes 2015-05-02 15:12:42 -07:00
SirBloodBuske 92789ec855 Revert "Revert "Intercom build/destroy""
This reverts commit 26ae8ac80e.
2015-05-02 00:19:34 -07:00