Commit Graph
16383 Commits
Author SHA1 Message Date
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
ZomgPonies c11264b11f Merge pull request #1091 from tigercat2000/TAPEEEEE
Duct Tape
2015-05-18 19:27:29 -04:00
ZomgPonies 1e2fca836a Merge pull request #1093 from Fox-McCloud/spray
Spraybottle Changes
2015-05-18 10:19:56 -04:00
ZomgPonies 7bea45fb8f Merge pull request #1089 from tigercat2000/vgspmoothin
Port -tg-'s port of /vg/'s smoothwall.
2015-05-18 10:18:58 -04:00
ZomgPonies ba493664b9 Merge pull request #1097 from Fox-McCloud/LINDA-fixups
LINDA Fixes
2015-05-18 10:18:44 -04:00
Krausus 778b61f7a2 Fixes nanopaste
It can now repair limbs and mechanical organs as intended.
2015-05-18 09:50:45 -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 bbd9f51107 Fixes shuttle ETA showing up late 2015-05-18 08:04:39 -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 cd0013c72e Fixes name of Warden's Office area 2015-05-18 03:16:55 -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 b73474e7f8 Fixes air alarm wire interaction for silicons 2015-05-18 02:36:54 -04:00
Krausus 93ef1d7e4f Fixes minor typo in ion law generator 2015-05-18 02:22:07 -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
Fox-McCloud 9238e44b22 LINDA Fixes 2015-05-17 21:24:47 -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
ZomgPonies 191e5dc3f2 Merge pull request #1077 from tigercat2000/HolidayDatums
Change holidays into datums
2015-05-17 13:51:32 -04:00
Tigercat2000 2d49015d4f Port -tg-'s port of /vg/'s smoothwall.
This commit ports -tg-'s port of the /vg/ smoothwall system. An important
thing to note is that we have extra code on top of the -tg- port to make
it work at all, and therefore, it may not be as efficent.
2015-05-17 07:39:53 -07:00
Krausus c14c69af02 Fixes bad loop in turf entered proc
It was checking THE WHOLE AREA for chairs. With EVERY STEP!
2015-05-16 23:35:44 -04: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
TheDZD cf90e1703b Merge pull request #1087 from tigercat2000/LightDefines
REFACTOR: Most consoles and machinery now use defines for light color
2015-05-16 21:04:45 -04:00
PJB3005 904e180938 Last fix 2015-05-17 02:06:53 +02: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
ZomgPonies a550e3fe17 Merge pull request #1084 from tigercat2000/NOSHEETSNO
2-Tile pod doors, Stacks building on shuttles
2015-05-16 16:16:22 -04:00
Tigercat2000 89a2df639a Apply new antag-restricted-roles stuff to traitorchan 2015-05-16 11:58:39 -07:00
Tigercat2000 7eac7651db Stacks can now build on any simulated turf
This commit lightens the restrictions on stacks, so that they can now
build on any type of /turf/simulated instead of requiring
/turf/simulated/floor.

The primary intent of this commit is allowing people to build on shuttles,
as they are now considerably less "magical", given that they have
lighting, and glass sheets + metal rods already ignore these restrictions.
2015-05-16 11:41:44 -07:00
Tigercat2000 56e3880fb6 FIX: 2-tile pod-doors
This commit re-enables 2-tile pod-doors and updates them to the new
pod-door standard.
2015-05-16 11:41:43 -07:00
ZomgPonies cc42298a3d Merge pull request #1081 from MrBauer24/bug_fix
Biogenerator fix
2015-05-16 09:07:24 -04:00
MrBauer24 499e0797be Biogenerator fix
Fixes bug #1076 and displays a warning message telling the user that the
beaker is full.
2015-05-16 13:54:26 +01:00
Tigercat2000 e232eb447c Rename cigs_lighters.dm to cigs.dm, to reflect lighters being seperated 2015-05-16 05:44:22 -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