Commit Graph

11404 Commits

Author SHA1 Message Date
ZomgPonies
ca8d675a94 world.view 2015-11-25 19:41:23 -05:00
ZomgPonies
a3969051d7 Fixes HUD overlays, a runtime with borgs AND AI sec/medhuds 2015-11-25 19:30:30 -05:00
ZomgPonies
a94e4651d4 Replace one typo by another gg 2015-11-25 15:05:38 -05:00
ZomgPonies
428db7a842 Fixes enemy communications 2015-11-25 15:04:22 -05:00
ZomgPonies
e803647ac6 Fixes shield overlays 2015-11-25 12:56:46 -05:00
Fox McCloud
b092cb7d45 Merge pull request #2644 from ZomgPonies/intercept
Allows for command reports to come from other people than centcom
2015-11-24 21:46:58 -05:00
TheDZD
0d6e53b871 Merge pull request #2639 from Fox-McCloud/relic-alteration
Makes Relic Spawn Different Animals
2015-11-24 21:40:05 -05:00
TheDZD
e010621101 Merge pull request #2643 from Fox-McCloud/research
Minor Research Tweaks
2015-11-24 21:39:40 -05:00
TheDZD
3211ba3a28 Merge pull request #2646 from Fox-McCloud/soy-sauce
Soy Sauce Recipe Change
2015-11-24 21:39:33 -05:00
Fox McCloud
c7ae3c0233 Merge pull request #2640 from FalseIncarnate/master
Random Chem Blacklists, Strange Plant Fixes
2015-11-24 21:38:22 -05:00
Tastyfish
317760a7de Merge remote-tracking branch 'upstream/master' into path_cleanups
Conflicts:
	code/modules/examine/descriptions/atmospherics.dm
2015-11-24 18:05:01 -05:00
TheDZD
3d8ebd680a Merge pull request #2633 from ZomgPonies/hulk
HULK fixes and balance
2015-11-24 16:47:35 -05:00
TheDZD
41765152a0 Merge pull request #2642 from ZomgPonies/nations5
Nations 2.1.2 bugfix
2015-11-24 16:45:25 -05:00
TheDZD
dcb387e61d Merge pull request #2647 from RudiPardieck/master
Corrected some spelling errors in the examine descriptions
2015-11-24 16:44:37 -05:00
ZomgPonies
fa84af4e22 Removes changes to RUN 2015-11-24 11:44:11 -05:00
Tigercat2000
b007c3cff7 Fix internals dropping exploit. 2015-11-24 07:07:52 -08:00
Certh
7d7a3dda1e Corrected some spelling errors in the examine descriptions 2015-11-24 10:17:46 +01:00
Fox-McCloud
2ba8854329 Soy Sauce Recipe Change 2015-11-23 21:13:10 -05:00
ZomgPonies
e9df2e0627 Allows for command reports to come from other people than centcom 2015-11-23 18:13:47 -05:00
Fox-McCloud
52d277a400 Minor Research Tweaks 2015-11-23 17:29:15 -05:00
TheDZD
9afae90ee4 Merge pull request #2628 from Fox-McCloud/slime-extracts
TG Slime Extracts Port
2015-11-23 17:22:50 -05:00
TheDZD
56d2da55b8 Merge pull request #2629 from Fox-McCloud/fox-rest
Adds Fox Resting Sprite
2015-11-23 17:22:45 -05:00
ZomgPonies
0aa20e2eeb Minor nations bug fixes 2015-11-23 14:32:48 -05:00
FalseIncarnate
7780b75429 Random Chem Blacklists, Strange Plant Fixes
Revival and expansion of #1002 (thanks Iamgoofball!)

Creates a reagent blacklist for use with random chem stuff like pills!
- Currently blacklists admin-only, antag-only, and other bad-times chems
like mutationtoxin.

Creates a SECOND blacklist for further refinement, intended for use with
strange plants in botany.
- Currently just blocks alcohol / alcoholic bar drinks from the random
chems to avoid "watering down" the selections

Creates a new helper proc/get_random_chemical() to return a randomly
selected chemical/reagent that is not blacklisted.
- If passed with no arguments, will only look at the first blacklist.
- If passed with an argument, will also include the second "plant"
blacklist
- Will attempt to select a random chemical, then compare it to the
blacklisted chems to see if it is acceptable
- If the chem is on the blacklist, it will start over until it finds an
acceptable one

Rewrote the random chemical portion of Strange Plants to utilize the new
get_random_chemical proc rather than rely on a hardcoded "whitelist"

Updates Strange Plants to not only contain Nutriment
- They can now contain Nutriment, Plant-Matter, Protein... OR A COMBO OF
THEM!

Hydro trays and soil now recognize Nutriment, Plant-Matter, and Protein
as actual nutrients for plants, as well as (slightly) improving yield
modifiers.

Extension of #2596 (thanks Fox for the temp-fix)
Fixes #2416
Fixes #2439 (again)
2015-11-23 01:26:11 -05:00
Fox-McCloud
60c5925670 Makes Relic Spawn Different Animals 2015-11-22 22:28:54 -05:00
Tastyfish
85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
Tastyfish
f2f227144a Examine module set vars on classes that didn't exist. 2015-11-22 19:42:59 -05:00
ZomgPonies
3d7004af3d HULK fixes 2015-11-22 14:35:37 -05:00
ZomgPonies
3590262ed2 Minor bugfix patch 2015-11-22 14:05:06 -05:00
Fox-McCloud
ad0031831b Adds Fox Resting Sprite 2015-11-22 06:07:07 -05:00
Fox-McCloud
3522d1f9bd TG Slime Extracts Port 2015-11-22 03:05:29 -05:00
TheDZD
740e5304fd Merge pull request #2613 from ZomgPonies/nations2
Nations 2.1
2015-11-21 22:20:39 -05:00
ZomgPonies
937cb63dfa Cyborg Egun no longer EMP immune 2015-11-21 22:06:09 -05:00
TheDZD
4075dba6fb Merge pull request #2596 from Fox-McCloud/seed-mutation
Seed Mutation Mutation Chems Removal
2015-11-21 21:27:21 -05:00
ZomgPonies
affdbf481c Replaced Combat & Peacekeeper borg plasma cutter with sonic jackhammer 2015-11-21 18:51:41 -05:00
ZomgPonies
66202ff4b6 Bugfixes 2015-11-21 10:46:16 -05:00
Fox McCloud
61d2ff3c4d Merge pull request #2615 from tigercat2000/md5sumgoeshere-fucknanoedition
HTML5 fixes, batch 1
2015-11-21 01:44:44 -05:00
Tigercat2000
d2ea2ae2e1 Fix pAI interface (somewhat) 2015-11-20 21:23:31 -08:00
TheDZD
843165e0e6 Merge pull request #2606 from ZomgPonies/grey
Grey verbal speech now Wingdings
2015-11-20 23:10:14 -05:00
TheDZD
0e33b7b65e Merge pull request #2610 from Fox-McCloud/bags-and-qol
Chemistry and Bio-Bags and Xenobio QoL
2015-11-20 20:45:15 -05:00
ZomgPonies
d96741eb8c Fixes copypaste procs 2015-11-20 19:52:41 -05:00
TheDZD
bbab399d6e Merge pull request #2599 from Fox-McCloud/thanksgiving-food
Thanksgiving Update
2015-11-20 19:46:47 -05:00
ZomgPonies
bd0dd2ab4b Added Peacekeeper borgs, removing thermals, giving them blue eyes, etc 2015-11-20 19:21:39 -05:00
ZomgPonies
589239f3cd Make combat borg shield only need inv to be active 2015-11-20 19:04:49 -05:00
ZomgPonies
9603d4e234 Fixes AI and robots not seeing nation HUDs 2015-11-20 18:22:07 -05:00
ZomgPonies
c51f92bf37 Adds combat droid subtype 2015-11-20 11:38:14 -05:00
ZomgPonies
e244fdb88d Gave combat borgs zipties and replaced laser with egun 2015-11-20 11:02:14 -05:00
ZomgPonies
a50882db5a Fixes ghosts not seeing nations 2015-11-19 22:04:41 -05:00
Fox-McCloud
edf2bfc4fc Chemistry and Bio-Bags and Xenobio QoL 2015-11-19 20:38:07 -05:00
TheDZD
cab49e0c83 Merge pull request #2588 from Fox-McCloud/panther
Updates Panther Sprite
2015-11-19 20:13:58 -05:00