Commit Graph

9475 Commits

Author SHA1 Message Date
Tigercat2000
e7ec8a7e2d Compile-fix 2015-05-10 14:21:44 -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
ZomgPonies
68d4b98af4 Merge pull request #996 from Robertha89/patch-5
Adds service radio to ai
2015-05-10 16:15:58 -04:00
ZomgPonies
8a3c2ef2fe Merge pull request #993 from Fox-McCloud/ooooops
Health Analyzer Name Fix
2015-05-10 16:15:41 -04: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
Robertha89
6cda382c5e Adds service radio to ai
Fixes an oversight.
2015-05-10 17:10:17 +02: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
Fox-McCloud
2ac1304df5 Health Analyzer Name Fix 2015-05-10 05:59:03 -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
ZomgPonies
2fdfbc729f Merge pull request #988 from tigercat2000/Spesswind
Add magboots stopping airflow push to LINDA
2015-05-09 22:40:49 -04:00
Tigercat2000
bccabe6d4f Add magboots stopping airflow push to LINDA
This commit adds an airflow push override to humans, which triggers when
the shoes they are wearing are a subtype of magboots and magpulse is
active. Therefore, magboots will prevent people from being pushed around
by "spacewind" or also known as airflow.
2015-05-09 19:23:10 -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
Fox-McCloud
be13c080e8 Merge pull request #975 from ZomgPonies/pixelfire
Pixel travel projectiles. WIP
2015-05-09 18:34:57 -04:00
ZomgPonies
99a18df13b Merge pull request #976 from Fox-McCloud/cryox
[Goonchem] Cryox/Clonex Change
2015-05-09 18:34:21 -04:00
TheDZD
b9227bd294 Merge pull request #938 from tigercat2000/PMGIP1
Procedural Map Generator Improvements - Patch 1
2015-05-09 13:10:52 -04: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
ZomgPonies
6dfb4a732d Finally done 2015-05-09 07:12:54 -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
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
ZomgPonies
3ff6339f04 Merge pull request #968 from Fox-McCloud/blobfix
Fixes Blob Zombies
2015-05-08 18:08:59 -04:00
ZomgPonies
a05e70585e Fixes 2015-05-08 17:59:42 -04:00
ZomgPonies
cb0a65b96f Let's try this 2015-05-08 17:32:34 -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
f4d7d74a26 Merge pull request #974 from TheDZD/minor-fixes
Removes NO_PAIN species being stun immune
2015-05-08 15:41:03 -04:00
DZD
ac14f6ebc8 Removes NO_PAIN species being stun immune 2015-05-08 15:19:35 -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
ZomgPonies
01a8fabaac Removed full access for supers 2015-05-07 23:51:15 -04:00
ZomgPonies
e7c1cf8eb3 Merge pull request #970 from Fox-McCloud/fixins
Various Fixes and Tweaks
2015-05-07 23:44:34 -04:00
Fox-McCloud
b20104b360 Various Fixes and Tweaks 2015-05-07 23:31:39 -04:00
ZomgPonies
a7a927b424 Finish up the E-N desc and default spell 2015-05-07 20:56:09 -04:00
ZomgPonies
bfb997f3d2 Gave EN a prototype magnetic spell 2015-05-07 20:51:47 -04:00
ZomgPonies
547f606677 Gave EN's suit minor magnitis, also made affect machine people 2015-05-07 18:20:55 -04:00
Fox-McCloud
a8ead35ea5 Fixes Blob Zombies 2015-05-07 17:35:43 -04:00
DZD
55d3937c8c Fluff item convenience
Along with a database change that I've made, this should allow fluff
items to be renamed on spawn without having to define them as a new
item.
2015-05-07 17:18:12 -04:00
ZomgPonies
b6ee03a3be Minor shoe fix 2015-05-07 17:01:38 -04:00
ZomgPonies
7423d56c06 Adds E-N and gear 2015-05-07 16:12:43 -04:00
ZomgPonies
0a7d2b8697 Added griffin headgear caw ability 2015-05-07 16:00:29 -04:00
ZomgPonies
71a23c338a Gave griffin a freedom implant 2015-05-07 15:51:25 -04:00
ZomgPonies
d249a7994e Made greyshirts look like greyshirt 2015-05-07 15:49:33 -04:00
ZomgPonies
0980c744db Fix henchman IDs and gave basic radios to eveyrone 2015-05-07 15:42:52 -04:00
ZomgPonies
d2dc8030e8 Add hooting ability to owlman's mask 2015-05-07 15:33:54 -04:00
ZomgPonies
dd4aba0c9e Panel oversight 2015-05-07 03:12:11 -04:00
Fox-McCloud
3c0beb216a Merge pull request #962 from ZomgPonies/superhero2
Superhero Overhaul Bugfix #1
2015-05-07 02:18:08 -04:00
ZomgPonies
fc3fbcb298 Merge pull request #960 from Aurorablade/Ihavenoideawhatiamdoing
Updated Corgi pAI Sprite (take 2)
2015-05-07 02:04:02 -04:00
ZomgPonies
a57560975d Merge pull request #957 from Krausus/CyborgHotkeys
Cyborg Pointing and Deselect/Unequip Module Hotkeys
2015-05-07 02:03:43 -04:00
ZomgPonies
841316bb83 Added descriptions for all current heroes. 2015-05-07 02:02:41 -04:00