Commit Graph

9603 Commits

Author SHA1 Message Date
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
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
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
FalseIncarnate
5cbd09f593 More Brooms and Horsemasks and Jerseys
Adds 2 Horsemasks to the AutoDrobe's hacked items list.

Adds 2 new crates to cargo: Team Jerseys Crate and Polo Supply Crate.
- Team Jerseys Crate (15 supply points) contains 4 red jerseys, 4 blue
jerseys, and 1 beach ball
- Polo Supply Crate (20 supply points) contains 6 brooms, 6 horse masks
(to put on the brooms), and 1 beach ball

Adds new jerseys: an alternative to athletic shorts that come in red and
blue. Red team is the NT Phi-ghters, Blue is the NT Pi-rates. Show your
team spirit today!
2015-05-16 04:14:08 -04:00
Krausus
835276e07e Fixes cooking machinery runtimes
Some recipes were sorted using paths that resulted in empty recipe types
(for example, /datum/recipe/microwave/human/burger causing an empty
/detum/recipe/microwave/human type to exist). These would be included in
the available recipes, and since their requirements are null, would all
be satisfied by anything in the machine. Since their result is null, a
runtime would occur while trying to create nothing.

This fixes some (all? Too lazy to test them all) kitchen machines never
failing.
2015-05-16 03:18:43 -04:00
Krausus
505531f1a6 Fixes AI crew monitor runtime
Instead of the AI crew_monitor being a per-AI variable, it was shared by
all AIs, and recreated each time a new AI was created, as part of that
AI's contents. Bots create and delete a new AI every time they transmit,
which means the crew_monitor would be deleted the moment a bot spoke
over the radio, causing it to runtime.

It is now a per-AI variable.
2015-05-16 02:03:09 -04:00
Krausus
2efeed6410 Fixes blood reagent runtimes
add_reagent was never creating blood with its default data, because it
always nulled out the data if none was provided
2015-05-16 01:41:46 -04:00
MrPerson
3d9fd8d6a0 Change holidays into datums
Holidays are now actual datums with procs and vars and everything.
Holidays run a proc called celebrate() when it's time to celebrate them.
Currently none of them do anything but that should change, wink wink.
Holidays can now run for more than a day. The important ones, april fools,
christmas, halloween, new years, and easter, all last at least a week.
The idea is so people can celebrate christmas in game without having to,
you know, actually play on fucking christmas. And also to put a time limit
on how long stuff like the annoying spookoween closet skeletons will stick
around so it doesn't overstay its welcome and become annoying as shit like
last year.

The event SS now allows more than 1 holiday to run at a time.
This matters for new years + christmas, easter + april fools, easter + 4/20,
and any holiday that can happen on friday the 13th.
The events get stored in a list that's only initialized if there's an active
holiday so testing for potential holidays is still pretty easy.
Added more easter dates so we won't have to add more until 2040.
The current batch run out in 2017.

:-------------PARACODE NOTES------------:
Tied to event process
Extra procs for holidays to be able to run special events alone
Admin manual-override functionality maintained and ported to new system
2015-05-15 20:52:39 -07:00
ZomgPonies
6a84ea02a8 Add ALL the sanity 2015-05-15 23:09:09 -04:00
ZomgPonies
b58b31e7cd Fix space cleaner 'cleaning' lighting 2015-05-15 22:59:38 -04:00
ZomgPonies
b823f3a99d Merge pull request #1072 from Fox-McCloud/those-fixes
Fixes and Tweaks
2015-05-15 22:35:25 -04:00
TheDZD
ed67e06c8d Merge pull request #1058 from ZomgPonies/apollo
Adds 2 new event species
2015-05-15 22:34:47 -04:00
Fox-McCloud
8a5e3663df Fixes and Tweaks 2015-05-15 21:58:24 -04:00
ZomgPonies
2023d19eca Merge pull request #1055 from tigercat2000/whiteshipactualship
Movable Telecomms White Ship
2015-05-15 19:38:06 -04:00
ZomgPonies
b6a672d49f Ugh 2015-05-15 19:34:14 -04:00
Tigercat2000
80d33eaab2 FIX: APC's unbuildable due to runtime
This commit fixes APC's being unbuildable due to a runtime error.
The runtime error was caused by checking for area.master, which no longer
exists after the lighting overhaul.

Signed-off-by: Tigercat2000 <nick.pilant2@gmail.com>
2015-05-15 13:08:52 -07:00
ZomgPonies
9f45272444 Typo fixes, missing icons 2015-05-15 15:50:45 -04:00
ZomgPonies
4ceb335a5e Snowflake fun removal 2015-05-15 15:36:39 -04:00
Fox-McCloud
05a58fa2f2 Merge pull request #1066 from ZomgPonies/master
Lighting runtime fix
2015-05-15 14:18:16 -04:00
ZomgPonies
ff929c3b59 Lighting runtime fix 2015-05-15 13:42:08 -04:00
PJB3005
a5523e69b0 Better emitter admin logging & a couple minor tweaks 2015-05-15 18:23:17 +02:00
ZomgPonies
7120277444 Fixes attack_hand snowflakiness 2015-05-15 11:44:33 -04:00
ZomgPonies
795f902c9b Merge pull request #1063 from tigercat2000/Iforgot
FIX: Linda airflow affecting mob when it shouldn't
2015-05-15 11:17:31 -04:00
PJB3005
a901320238 Fixings 2015-05-15 17:06:51 +02:00
ZomgPonies
2c965aef08 Fixes reported issues. 2015-05-15 10:57:37 -04:00
Tigercat2000
49bf914c14 FIX: Linda airflow affecting mob when it shouldn't
This commit fixes Linda airflow affecting AI eyes, blob overminds,
observers, and replaces the magboot check for humans with a better
version.
2015-05-15 05:08:48 -07:00
FalseIncarnate
55087890de Brooms, Stick-horses, and Flying Wizards!
A port of https://github.com/d3athrow/vgstation13/pull/4377

![image](http://i.gyazo.com/dd415093be904dc9e5d40570598eddb9.gif)

Allows brooms to be wielded with 2-hands. Doing so places the broom
between your legs so you look like you are riding it.

You can also put a horsehead mask onto the broom to create a stick-horse
to ride. This can also be wielded, but will ALWAYS appear between your
legs.

And for the more magically inclined, wielding a broom or stick-horse (2
hands!) will cause you to ride it like a witch, giving you the ability
to bypass hazards such as tables and banana peels.
2015-05-15 03:52:36 -04:00
Krausus
b908a4b0ab Fixes copy-paste error
It was like this before I changed it!
2015-05-15 02:08:28 -04:00
Krausus
f5f15881c2 Fixes luminosity checks
They should now be more in-line with how they worked under the old
lighting system.
2015-05-15 01:07:08 -04:00
ZomgPonies
95b1c1d87c Adds two new event species 2015-05-14 22:30:38 -04:00
TheDZD
ec5acc5e57 Merge pull request #1026 from ZomgPonies/lights
All lightbulbs in light explosion damage range break
2015-05-14 19:44:44 -04:00
Tigercat2000
21b1017178 Makes the white telecomm ship an actual movable shuttle 2015-05-14 14:55:22 -07:00