Commit Graph

4021 Commits

Author SHA1 Message Date
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 68d4b98af4 Merge pull request #996 from Robertha89/patch-5
Adds service radio to ai
2015-05-10 16:15:58 -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
Tigercat2000 a46518f120 Increase very low probability to escape grabs
This commit raises two probability values in resist code, namely for
resisting out of grabs. The previous probabilities were 25 and 5, they are
now 60 and 15.
2015-05-10 12:09:58 -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
Robertha89 6cda382c5e Adds service radio to ai
Fixes an oversight.
2015-05-10 17:10:17 +02:00
Tigercat2000 0e948ffeec Remove Jointbreaking, Joint fracturing, and Knifing
This commit removes Jointbreaking, Joint fracturing, and Knifing from the
grab system due to near-universal dislike of the features.
2015-05-10 06:46:58 -07: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
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 5f544648c8 Adds in Unathi Tail Wagging 2015-05-09 20:28:07 -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
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
TheDZD 6515b10ccc Merge pull request #963 from ZomgPonies/superhero2
Superhero Overhaul Part 2: Magnetic Boogaloo
2015-05-08 16:55:59 -04:00
DZD ac14f6ebc8 Removes NO_PAIN species being stun immune 2015-05-08 15:19:35 -04:00
Tigercat2000 eee9339ef3 CBGI updat
This commit updates the previous commit with the latest changes from the
CB:GI git.

Primary Changes:
 - Dancing! Passively grab someone, they passively grab you, looks like
   dancing/wrestling. You get the image, I'm sure.
 - Clarifications and possible runtime nipping.
2015-05-08 07:56:16 -07:00
ZomgPonies 01a8fabaac Removed full access for supers 2015-05-07 23:51:15 -04:00
ZomgPonies a7a927b424 Finish up the E-N desc and default spell 2015-05-07 20:56:09 -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 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
Tigercat2000 5f26969364 Merge remote-tracking branch 'upstream/master' into ContextBasedGrab
Conflicts:
	code/modules/mob/mob_grab.dm
2015-05-07 06:02:19 -07:00
Tigercat2000 4914e8c2b7 Adds a bunch of new things to grabs
This commit adds the following to the grab system:
 - Knifing (Attack with edge weapon while neckgrabbing)
 - Pressing eyes (Harm intent, neck grab, eye zone)
 - Jointlocking (Grab intent, neck grab, almost any limb)
 - Headbutting (Harm intent, neck grab, target chest or groin)
 - Pin (Disarm intent, pins affecting to the ground until you move or let
   go with help intent)
2015-05-07 05:56:14 -07: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
ZomgPonies 956aa6eda1 Added action button for Griffon ability 2015-05-07 00:21:08 -04:00
ZomgPonies 98938edf61 minor commit to open PR 2015-05-06 23:53:38 -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
Aurorablade 56ea5311a9 Revert "Manual update"
This reverts commit 7aa67928b3.
2015-05-06 20:57:37 -04:00
Aurorablade 55c2ad3941 Merge pull request #1 from Aurorablade/master
Manual update
2015-05-06 19:41:10 -04:00
ZomgPonies cd17fa4fb4 Refactor and clean up code 2015-05-06 19:14:22 -04:00
DZD 7f925dc8fa Fixes posibrains
Reverts changes made to brain_item.dm and posibrain.dm in the original
shadowling PR. They were made to stop runtimes but apparently broke
posibrains, the runtimes were completely senseless in the first place,
and only occur on that specific branch, tested these changes and no
runtimes occur.
2015-05-06 19:12:00 -04:00
Aurorablade 7aa67928b3 Manual update 2015-05-06 18:19:20 -04:00
Fox-McCloud e004610827 Merge pull request #956 from TheDZD/shadowling
Shadowling Fixes
2015-05-06 18:18:28 -04:00
ZomgPonies 9c011f5b25 Re-added hitblips for superheros POW WHAMMY 2015-05-06 18:05:16 -04:00
ZomgPonies d9fb43b674 Remove griffin's op powers and revert lasereyes change 2015-05-06 17:42:48 -04:00
ZomgPonies 68c17a1e06 Added Griffin recruit ability 2015-05-06 17:41:11 -04:00
DZD 830b7bde99 More fixes
- Fixes shadowling HUD (for real this time).
- Adds antag role display in shadowling hivemind, this prints
(Shadowling) or (Shadowling Thrall) prior to each message, depending on
the role of the speaker (although theoretically multi-antags could have
something else there).
2015-05-06 17:39:36 -04:00
ZomgPonies a02bb8a1ae Fix up show antagonist to list heroes and villains 2015-05-06 03:07:46 -04:00
Krausus a6f2d385f2 Adds cyborg deselect/unequip module hotkeys
Drop Item will now deselect, and Toggle Throw will now unequip and cycle
to the next module; previously, these hotkeys did nothing for cyborgs.
Also, unequipping a module while the module list is open will now update
it like it should.
2015-05-06 00:40:34 -04:00
Fox-McCloud 5a427555fd Merge pull request #954 from ZomgPonies/limbs
Minor limb sprite fix
2015-05-05 23:26:32 -04:00
DZD a769b4fc39 Shadowling fixes
- Fixes shadowling thralls not showing up on Check Antagonists.
- Also adds vampire thralls to Check Antagonists
- Fixes shadowlings not turning off hardsuit helmet lights.
- Fixes transforming into a shadowling dropping organs.
- Adds job such as blueshield, NT rep, and pod pilot to the list of jobs
that cannot be shadowlings.
- Remove ascended shadowling commune, transfers the shadowling's
languages to the ascendant instead.
- Fixes intercept not being sent to the station on shadowling rounds.
2015-05-05 21:44:44 -04:00
ZomgPonies 43981fb34e Added lightning spell to wizards 2015-05-05 20:54:57 -04:00