Commit Graph

16439 Commits

Author SHA1 Message Date
ZomgPonies
c8f9aa0c33 Merge pull request #1140 from Fox-McCloud/tweaking-stuff
Tweaks and Fixes 2.0
2015-05-22 17:24:29 -04:00
ZomgPonies
2d1b8f422e Merge pull request #1128 from Fox-McCloud/LINDA-Fixes
More Linda Fixes
2015-05-22 17:22:20 -04:00
Fox-McCloud
9eae10ef28 Merge pull request #1141 from tigercat2000/morelindacri
REFIXOR: Turf Gas Visuals
2015-05-22 17:17:28 -04:00
TheDZD
67fd1bb8fd Merge pull request #1123 from Fox-McCloud/cyborg-tweak
Cyborg Tweaks
2015-05-22 17:06:06 -04:00
Tigercat2000
42dff8d095 REFIXOR: Turf Gas Visuals
This commit does the following:
 - Adds a missed call to simulated/update_icon() to update the atmos
   visuals
 - Fixes plasma not showing up on engine floors on New()
2015-05-22 14:03:47 -07:00
Fox-McCloud
8bdc09ad38 Merge pull request #1111 from ArgyleSweatshop/patch-2
Make Sake,Kahlua, and Soy Sauce Recipe more realistic
2015-05-22 17:02:15 -04:00
Fox-McCloud
db442b4486 RCD Fix 2015-05-22 16:55:41 -04:00
Fox-McCloud
f51c900a5e derp 2015-05-22 16:42:49 -04:00
Fox-McCloud
1c1eec3210 Tweaks and Fixes 2.0 2015-05-22 16:29:12 -04:00
Krausus
8acfc2dc93 Fixes teleport artifacts inserting you into atoms 2015-05-22 09:13:38 -04:00
Krausus
f5a00dcc28 Fixes match attack proc and processing
Fixes their missing attack proc (used to light others' cigarettes) and
matches still processing (and creating hotspots) after being dropped.
2015-05-22 08:43:57 -04:00
Krausus
01b5f09b22 Fixes missing icon/description for used zipties 2015-05-22 08:10:30 -04:00
Krausus
2c1204e534 Adds sanity check to bantype check
Just in case.
2015-05-21 22:45:58 -04:00
Krausus
d91e8ecc15 Fixes permanent bans showing expiration times 2015-05-21 21:48:30 -04:00
Krausus
e86fd2a636 Fixes missing sanitization in karma logging 2015-05-21 20:54:06 -04:00
Krausus
538b7b6e22 Fixes non-admins seeing stealthmins in adminwho 2015-05-21 20:37:28 -04:00
Fox-McCloud
f04dd858cf Merge remote-tracking branch 'upstream/master' into LINDA-Fixes 2015-05-21 19:35:35 -04:00
Fox-McCloud
0da9c966f0 More Linda Fixes 2015-05-21 19:33:54 -04:00
Fox-McCloud
034a260fd1 Merge pull request #1119 from tigercat2000/pod
Refactor, Light colors for Spacepods.
2015-05-21 18:15:29 -04:00
ArgyleSweatshop
6d4435f4d0 Adds flour to flour packs
Doesn't affect anything cooking-related, but allows you to get flour if you grind up flour packets
2015-05-21 15:33:31 -04:00
Tigercat2000
34a399e5cc MTTS: Control Panel Anchored, More whitelisting
This commit fixes the bug of being able to steal a tram's controller,
because it was not anchored. It also adds two new things and a minor
refactor to the "allowed-to-move-this-even-if-anchored" system, chairs,
windows, and grilles.
2015-05-21 06:47:21 -07:00
ZomgPonies
42441dcb02 Merge pull request #1124 from Krausus/AwayMissionAirFix
Fixes Air Initialization for Away Missions
2015-05-21 08:42:39 -04:00
ZomgPonies
3e828465f2 Merge pull request #1114 from tigercat2000/massindrivein
/vg/ mass driver port
2015-05-21 08:40:58 -04:00
Krausus
e0349a17d0 Fixes air initialization for away missions
Away missions' turfs will now actually have their air initialize after
being loaded
2015-05-21 04:56:05 -04:00
Fox-McCloud
7fc1dab704 Cyborg Tweaks 2015-05-21 04:02:19 -04:00
Fox-McCloud
22180af1c0 Merge pull request #1112 from FalseIncarnate/master
[Feature][Refactor][Review Requested] Nutrient Changes and Dietary Concerns
2015-05-21 03:09:30 -04:00
Tigercat2000
e03a1d7f23 Emergency Patch: Mobs not breathing right in containers
THANKS FOXBAMA
2015-05-20 17:40:32 -07:00
Tigercat2000
367812c77d Spacepod: loc = -> forceMove()
This commit changes a few "loc =" definitions in spacepod code that should
really be forceMove() as forceMove()
2015-05-20 15:31:46 -07:00
Tigercat2000
c82f661102 Refactor, Light colors for Spacepods.
This commit makes a major refactor to spacepod code, mostly just cleaning
up the huge mess I left behind with the two-seater code.

This commit also adds a small feature: Based on their icon_state,
spacepods will have different headlight colors.
2015-05-20 15:02:30 -07:00
Tigercat2000
66044413f0 Refactor a few spacepod verbs, Fix being unable to open 2 tile poddoors 2015-05-20 09:10:39 -07:00
ZomgPonies
b8634ff432 Merge pull request #1117 from Krausus/AITrackingFix
Fixes AI camera tracking
2015-05-20 10:33:05 -04:00
Krausus
aea292d3a1 Fixes tracking of off-camera AI bots 2015-05-20 07:22:18 -04:00
Krausus
9d5d8f697c Fixes AI camera tracking
Fixes tracking everyone where, not being able to track everyone with
suit sensors maxed, and not seeing all trackables in the tracking list
2015-05-20 07:03:01 -04:00
Fox-McCloud
973d19af67 Merge pull request #1102 from ZomgPonies/secrets
Dice Rolling and secrets panel cleanup
2015-05-20 06:55:54 -04:00
ZomgPonies
6a6aab7461 Merge pull request #1110 from Krausus/Fixes-201505191414
Fixes Exchange Runtime and Ling Blood Regen
2015-05-20 06:52:54 -04:00
ZomgPonies
5909e26736 Merge pull request #1106 from tigercat2000/tram2
Modular Train/Tram System: Take 2, let's not break the working tree
2015-05-20 06:52:39 -04:00
ZomgPonies
864a7d70f3 Merge pull request #1105 from Fox-McCloud/LINDA-gas-defines
LINDA--Updated Gas Datums and Atmospheric Defines
2015-05-20 06:52:10 -04:00
Tigercat2000
e470eee477 TMDU: Mass Driver Overhaul
This commit overhauls mass drivers.
Every component of mass drivers are now buildable.
This means:
 - Mass Drivers
 - Mass Driver Control Computers
 - Mass Driver Buttons
Mass driver control computers now support multiple mass drivers.
You can link mass-drivers to buttons via multitool.
Buttons have a range of 7 for their mass driver link.
Computers have infinite range.
2015-05-19 20:28:48 -07:00
ArgyleSweatshop
0dc472bf01 Make Sake,Kahlua, and Soy Sauce Recipe more realistic
Soy sauce is definitely not made from acid, so I made the recipe more realistic, using the INTERNET!

Also, Kahlua is made from rum or vodka in addition to the ingredients already included, so I added that.
Sake is made from rice alcohol and it is by and large always diluted by water, so that was added to the recipe.
2015-05-19 19:21:05 -04:00
FalseIncarnate
1f6ce567f7 Food Reagent Update (First Pass)
Initial update of food reagents to utilize new nutrient reagents

Fixes the blood tomato mutant list to actually allow mutation into
killer tomato.
2015-05-19 18:45:44 -04:00
Krausus
f2cf32681e Fixes restore_blood()
This is used by changeling abilities to refill blood. It wasn't doing
so.
2015-05-19 14:44:58 -04:00
Krausus
cae8bd68bf Fixes exchange objectives, probably
This should at least fix the runtime spam
2015-05-19 14:25:38 -04:00
ZomgPonies
a155e9e049 Merge pull request #1107 from tigercat2000/IAMNOTFUCKINGCRAZY
Add station time to human status panel.
2015-05-19 11:13:52 -04:00
ZomgPonies
0c43aae627 Merge pull request #1108 from Krausus/StatPanelFixes
Stat Panel Fixes
2015-05-19 11:13:10 -04:00
Krausus
41b0dbf5f7 Fixes new player stat panel runtimes
Whoops!
2015-05-19 10:43:59 -04:00
Krausus
1e046c9fa4 Stat Panel Fixes
Fixes shuttle ETD, debugging info in Status tab, ghost alt-clicking,
mind-level spell listing, and ordering of Lobby tab.
2015-05-19 10:06:05 -04:00
Tigercat2000
f975b2851a Add station time to human status panel. 2015-05-19 04:50:46 -07:00
FalseIncarnate
96ef62e297 Diet Changes
Changes the Kidan racial diet to DIET_HERB, from DIET_OMNI, to maintain
consistency with Paradise Lore.

Removes diet flags from Diona and IPCs since they utilize alternate
nutrition sources. This prevents them from benefiting from any
nutriment, protein, or plant-matter they metabolize.

Adjusted comments in the on_mob_life procs for Protein and Plant-matter
to better explain the diet flag checks and correct a copy-paste mistake
on the comments.
2015-05-19 06:14:41 -04:00
ZomgPonies
b3f6c15271 Merge pull request #1100 from Fox-McCloud/language
Adds Human Only Language
2015-05-19 04:59:27 -04:00
FalseIncarnate
fbd2ce16e6 Nutrient Split and Diet Flag
Adds Protein and Plant-matter reagents, nutritional values of 15

Reduces nutritional value of Nutriment to 12, down from 15

Adds new flag defines for racial diets, and new dietflags var to species
(must be set manually in the species definition, otherwise it will be
null)

Assigns each species their respective diet's flag:
- Carnivores: Unathi, Slime People
- Omnivores: Human, Tajaran, Kidan, Vox, IPC, Shadowpeople, Golems,
Plasmaman, Nucleation, Vox Armalis
- Herbivores: Skrell, Diona, Grey, Wryn

Adds checks to all nutrient on_mob_life procs to handle simple_animals
versus carbon/human mobs
- Simple animals will heal from any nutrient source, but don't gain
nutritional value since they don't appear to deplete it

Adds check to Nutriment on_mob_life proc to ensure that the diet for a
species has been set
- Failure to set a diet flag will prevent the species from benefitting
from ANY nutrients, while metabolizing the reagents normally
- This is largely for ensuring the species is properly defined

Adds checks to Protein and Plant-matter on_mob_life procs to handle
incompatible diets
- Ingesting Protein does not benefit Herbivores, but will metabolize out
of the body normally
-Ingesting Plant-matter does not benefit Carnivores, but will metabolize
out of the body normally
2015-05-19 04:55:30 -04:00