Commit Graph

4828 Commits

Author SHA1 Message Date
TheDZD
6bdb1af83d Merge pull request #1022 from ZomgPonies/gui
Allows GUI buttons for accessories
2015-05-12 20:11:41 -04:00
ZomgPonies
4c043396a9 Merge pull request #1023 from tigercat2000/Somebugs
Get_Area(), Event, and grab fixes
2015-05-12 20:11:32 -04:00
Tigercat2000
3a6ab84e83 Get_Area(), Event, and grab fixes
This commit fixes the following things:
 - Get_Area() now properly returns the area
 - Events will no longer runtime upon being manually triggered by an admin
 - The prison break event works again
 - Grabbing will no longer runtime (May result in people with pixel
   offsets from a grab being stuck, better than a runtime)
2015-05-12 17:04:28 -07:00
ZomgPonies
396dc7c00b Was missing an important bit 2015-05-12 20:04:18 -04:00
ZomgPonies
a26cda2fa1 Allows GUI buttons for accessories 2015-05-12 19:23:17 -04:00
ZomgPonies
1dea1acbb9 Cleanup 2015-05-12 18:33:40 -04:00
ZomgPonies
825f4c1c06 Mob login runtime fix 2015-05-12 18:07:30 -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
ZomgPonies
c29d2f4dac Merge pull request #1008 from tigercat2000/VcrawlFixes
Generic ventcrawling + Bugfixes
2015-05-12 14:35:01 -04:00
ZomgPonies
2a0dcedd64 Couple of superhero fixes 2015-05-12 08:10:04 -04:00
ZomgPonies
884fb4e4ca Merge pull request #981 from tigercat2000/ContextBasedGrab
Context-Based: Grab Intent (Bayport)
2015-05-11 17:44:33 -04:00
Tigercat2000
7ca4eeb703 Fix headbutting and remove drawback 2015-05-11 14:43:45 -07:00
ZomgPonies
303a664f78 Merge pull request #1000 from Fox-McCloud/species-touchup
Species Touchups
2015-05-11 17:06:52 -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
Tigercat2000
1266df1f3d Generic ventcrawling + Bugfixes
This commit makes the ventcrawling system operate independant of
ventcrawling verbs. Every type of /mob/living now has a ventcrawling
variable, which allows them to interact with the ventcrawling system if
set to 1 or 2. The AltClickOn() defines for each ventcrawling mob have
been removed, and replaced with a single AltClick() define on ventcrawl
machinery.
2015-05-11 06:28:44 -07:00
Tigercat2000
a3a1236c23 CBGI: Comment out every controversial thing
This commit comments out all of the controversial code from the new grab
system. The code is being left non-hard-deleted as an example, the
framework would be a shame to kill.
2015-05-11 04:43:09 -07:00
Krausus
520699c4ae Fixes spawning as NPC/drone before game start 2015-05-11 07:16:34 -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
ZomgPonies
6fe5db524a Fixes reflecting projectiles 2015-05-10 20:10:27 -04:00
ZomgPonies
1ecdb14fa3 Merge pull request #987 from Fox-McCloud/unathi-tail
Adds in Unathi Tail Wagging
2015-05-10 19:59:41 -04:00
Fox-McCloud
1325bd562e tweak 2.0 2015-05-10 17:42:25 -04:00
Tigercat2000
82d615f5b3 Merge remote-tracking branch 'upstream/master' into ContextBasedGrab
Conflicts:
	code/game/atoms.dm
2015-05-10 14:28:03 -07:00
Fox-McCloud
1e32bd1205 Species Touchups 2015-05-10 17:19:22 -04: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
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
fe5d0d907a Fix a few things with grabs
Previous commit broke a few things, this one fixes it

Fixed;
 - Runtime error of trying to assign something that was deleted
 - Nonsensical functionality
2015-05-07 06:25:05 -07:00