Commit Graph

9632 Commits

Author SHA1 Message Date
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
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
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
ZomgPonies b3f6c15271 Merge pull request #1100 from Fox-McCloud/language
Adds Human Only Language
2015-05-19 04:59:27 -04:00
Tigercat2000 c96631c6bd MT/TS: Added to map, fluffy cleanup, icon fix
This commit adds an MT/TS to the research department, changes the names
and descriptions of the tram parts to have a little more care, and
slightly fixes the rail icon.
2015-05-18 18:07:14 -07:00
Tigercat2000 7ad2127464 MT/TS: Damage procs
This commit adds missing damage procs to the /obj/tram/ type, including
 - ex_act
 - emp_act
 - meteorhit
 - attack_animal
 - bullet_act

It also refactors the "don't steal this" code to make a bit more sense.
2015-05-18 17:45:34 -07:00
Tigercat2000 f9a3951139 MT/TS: Rails
This commit converts the MT/TS control system from a debugging move panel
to a on-rails system. The controlpad has been repurposed as an on/off
button.
2015-05-18 17:45:27 -07:00
Tigercat2000 22fd91853f Split tram module into files, Document tram module 2015-05-18 17:45:20 -07:00
Tigercat2000 2b31d1b9ee Initial commit of MT/TS. 2015-05-18 17:45:10 -07:00
Fox-McCloud 0a4ea0b326 LINDA--Updated Gas Datums and Atmospheric Defines 2015-05-18 20:10:30 -04:00
ZomgPonies c11264b11f Merge pull request #1091 from tigercat2000/TAPEEEEE
Duct Tape
2015-05-18 19:27:29 -04:00
ZomgPonies 9b3f1646b3 Cleanup of topic and new dice roll 2015-05-18 11:31:44 -04:00
ZomgPonies 1e2fca836a Merge pull request #1093 from Fox-McCloud/spray
Spraybottle Changes
2015-05-18 10:19:56 -04:00
Krausus 6aec924f73 Fixes biogenerator issues
Fixes the biogenerator getting stuck if it can't fill a beaker, eating
resources if it can't fill a beaker, and getting splashed every time you
tried to load a beaker.
2015-05-18 08:54:26 -04:00
Krausus 4283430159 Fixes surgery runtimes/errors 2015-05-18 06:12:40 -04:00
Krausus 13cac3571e Fixes splinting and broken limb dropping
Splints will now work again, on arms/hands/legs/feet, and health
analyzers will warn about unsplinted limbs. Having a broken left arm
will no longer cause you to drop what's in your right hand.
2015-05-18 05:59:31 -04:00
Krausus fc4863f97c Fixes Signaler sleeping and frequencies
This brings handheld signalers in line with the frequency range of
cartridge-based signalers, and fixes anomalies' built-in signalers to
also be in this range.
2015-05-18 04:52:49 -04:00
Krausus b55903227e Fixes missing Rejuvenate resets
Now resets brain op stage (which was causing beheaded people to die
instantly after rejuv) and decay level (which made long-dead people all
icky)
2015-05-18 04:03:04 -04:00
Krausus b5adee39bc Fixes pAI laws in Check AI Laws
Also, I fixed a weird chunk of text in the admin newscaster code,
because it was screwing up the syntax highlighting and bugging me.
2015-05-18 03:49:53 -04:00
Krausus f669cd17cd Fixes Industrial Dropper icons 2015-05-18 03:22:03 -04:00
Krausus 42f0938bd8 Fixes Alden-Saraspova counter's scan timing 2015-05-18 03:13:02 -04:00
Krausus b82d2c0948 Fixes errors in Round Status' round duration 2015-05-18 03:05:02 -04:00
Krausus 93ef1d7e4f Fixes minor typo in ion law generator 2015-05-18 02:22:07 -04:00
Fox-McCloud 38879b51a6 Adds Human Only Language 2015-05-18 01:47:12 -04:00
Fox-McCloud f5d78af0b4 Merge pull request #1098 from FalseIncarnate/master
[Fix] Fruit Description Fix
2015-05-18 01:11:07 -04:00
FalseIncarnate fe2908ef67 Re-adds Psilocybin Check for Fruit Descriptions
Since we still have psilocybin. removing it from the check entirely was
unnecessary. Fruit with Psilocybin, LSD, or Space Drugs will now all
properly display the "hallucinogenic" descriptor.
2015-05-18 00:15:43 -04:00
FalseIncarnate e4e41ce24c Fruit Description Fix
Fixes checks for old chems to use ones for new chems. Some of these
chemicals currently aren't in any fruits (like juices) but may appear
once we expand the chem list for random seeds.

Will update the descriptions to account for new chems at such time that
goof's PR is finished if he doesn't include it.
2015-05-17 21:38:32 -04:00
Tigercat2000 ecf4effafc Fix GAC, tank control, AAC boards
This commit fixes the designs for the GAC, the Tank Control, and the AAC.
2015-05-17 17:18:33 -07:00
Fox-McCloud 65c8070ec8 Spraybottle Changes 2015-05-17 18:43:57 -04:00
Tigercat2000 a8702efd6b BAYPORT: Duct Tape
This commit ports Duct Tape from bay, alongside a few other changes for
our own code.

Bay12 Features:
 - You can tape paper to.. anything basically, like a sticky note.

Changes from Bay12:
 - Tape is a stack now, and has 10 uses per roll.
 - The guitar recipe now calls for 5 pieces of tape.
2015-05-17 14:11:25 -07:00
Tigercat2000 0a66ac4ba5 Merge remote-tracking branch 'upstream/master' into HolidayDatums
Conflicts:
	code/__DEFINES/misc.dm
2015-05-16 18:40:54 -07:00
ZomgPonies 23a510b743 Merge pull request #1034 from tigercat2000/fluffclean
Clean out unused fluff items
2015-05-16 21:27:11 -04:00
ZomgPonies 572f364da4 Merge pull request #1054 from PJB3005/vg-masterrace
/vg/ Multitool Menu port + More things constructible + AAC
2015-05-16 21:26:54 -04:00
Tigercat2000 13e395e9c6 REFACTOR: Most consoles and machinery now use defines for light color
This commit refactors light_color definitions for most machines and
consoles that use light_color's. Instead of having the same color repeated
over and over again, there are #defines for most of the common ones.

Some machines and other places may not use lighting defs- this is
intentional. The defines as they are, are relatively clean, and machinery
was where the bulk of repeated light definitions were. Other, special
colors, can just be defined in the same file that they are used once in.
2015-05-16 13:29:29 -07:00
Tigercat2000 337c90662f Readd fluff pens, with fluff path removed 2015-05-16 05:40:39 -07:00
Tigercat2000 0996890e44 Merge remote-tracking branch 'upstream/master' into fluffclean
Conflicts:
	paradise.dme
2015-05-16 05:38:40 -07:00
Tigercat2000 9d91387473 Fluff item restoration - Flasks, Lighters
This commit readds every fluff lighter to a new lighters.dm file, as well
as moving every lighter into it. There are enough to justify seperating it
from cigs_lighters.dm. Fluff lighter paths have not been touched for
compatibility to the database and map.

This commit also readds the flasks, with the fluff paths removed.
2015-05-16 05:36:56 -07:00
ZomgPonies 59ed4f69ad Merge pull request #1080 from tigercat2000/WHYDOTHESEKEEPSWITCHING
FIX: Attack logs being backwards
2015-05-16 07:52:33 -04:00
Tigercat2000 b7e5aa5597 FIX: Attack logs being backwards
This commit fixes attack logs being backwards on some erroneous add_logs
arguments.

Things fixed:
 - Martial arts
 - EMP Flashlight
 - Defibrillator
 - C4
 - Handcuffs
 - Resonant Fields
 - Alien Larva attack_animal
 - Mobs being grabbed
2015-05-16 04:41:37 -07:00
ZomgPonies 6bfd92b16a Merge pull request #1061 from FalseIncarnate/wizard
Brooms, Stick-horses, and Flying Wizards!
2015-05-16 07:34:22 -04:00
Krausus bfa93d5cd9 Fixes detached organ process() runtime
This may cause certain organs that wouldn't previously take damage over
time to now do so.
2015-05-16 06:23:48 -04:00
Krausus 67323c8309 Fixes clientless pAI booping runtime
pAIs without an active client can now be booped back into their card
form.
2015-05-16 06:16:16 -04:00
Krausus e42e53aac8 Fixes stripping's pickpocket check runtimes
When attempting to strip a human, wearing pickpocket gloves makes
certain actions stealthy. Some of the checks for pickpocket gloves would
runtime when a non-human mob attempted to pickpocket certain slots;
these runtimes have been fixed.

As a consequence of this change, cyborgs - and perhaps certain other
mobs - will now be able to remove IDs and empty pockets.
2015-05-16 04:54:03 -04:00