Commit Graph

8939 Commits

Author SHA1 Message Date
Krausus
cd0013c72e Fixes name of Warden's Office area 2015-05-18 03:16:55 -04:00
Krausus
b73474e7f8 Fixes air alarm wire interaction for silicons 2015-05-18 02:36:54 -04:00
ZomgPonies
191e5dc3f2 Merge pull request #1077 from tigercat2000/HolidayDatums
Change holidays into datums
2015-05-17 13:51:32 -04: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
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
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
575ed36fdc Fixes eye stabbing runtime
This will allow eye stabbing to properly weaken victims.
2015-05-16 05:46:53 -04:00
Krausus
aee11e857a Fixes cryopod item preservation runtimes
Cryopods attempt to preserve certain important items when despawning
their occupants. They also attempt to remove the contents of anything on
their occupants. Some preserved items have important contents, which
should not be removed, and may cause runtimes after retrieval. This
should fix those runtimes.
2015-05-16 05:20:49 -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
f575331f74 Fixes runtime in health analyzers 2015-05-16 03:36:22 -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
89de5e89fe Fixes vending machine assembly runtime
Vending machines would attempt to build_inventory using what appears to
have been an old, multi-call method, including a named argument that no
longer exists and would runtime.
2015-05-16 02:25:13 -04:00
Krausus
224f0ff1d9 Fixes soap cleaning runtime
If you tried to clean an atom with soap, and that atom was deleted
before you finished cleaning, the message attempting to display its name
would runtime.
2015-05-16 02:14:34 -04:00
Krausus
d838b942a6 Fixes lighting runtime caused by AI upload computer 2015-05-16 00:31:04 -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
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
TheDZD
305777534c Merge pull request #1070 from MrBauer24/bug_fix
Made flares brighter
2015-05-15 22:09:11 -04:00
Fox-McCloud
8a5e3663df Fixes and Tweaks 2015-05-15 21:58:24 -04:00
ZomgPonies
5473cee261 Merge pull request #1071 from tigercat2000/minorfixes
Minor refactors and fixes.
2015-05-15 21:32:32 -04:00
Tigercat2000
e3fa336252 REFACTOR: Gibber, \red to span class 2015-05-15 17:31:25 -07:00
Tigercat2000
d0da3cb28d REFACTOR: Firelock click override code
Instead of a snowflake check in adjacent.dm, doors now actually properly
use their nice open_layer and close_layer when opening and closing, thus
removing the need for a snowflake check to open firelocks that would
appear on the same layer as doors.
2015-05-15 17:13:03 -07:00
MrBauer24
47092f4c07 Made flares brighter
updates flares, made them brighter as per the request.
2015-05-16 01:10:43 +01:00
ZomgPonies
2023d19eca Merge pull request #1055 from tigercat2000/whiteshipactualship
Movable Telecomms White Ship
2015-05-15 19:38:06 -04:00
IAmBigCoat
e453f6c97b Merge branch 'master' into pipeWrench 2015-05-15 18:09:32 -04:00
IAmBigCoat
ad048d350a Pipe fixes. Disappearing pipes are gone.
Also I fixed a little problem with pipe caps. The sprites were the wrong direction for West and North.
2015-05-15 17:45:06 -04:00
ZomgPonies
4ceb335a5e Snowflake fun removal 2015-05-15 15:36:39 -04:00
PJB3005
a5523e69b0 Better emitter admin logging & a couple minor tweaks 2015-05-15 18:23:17 +02: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
ZomgPonies
49af6e93a6 Merge pull request #1060 from Krausus/LumFix
Fixes Luminosity Checks
2015-05-15 11:17:08 -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
28f569f386 Fixes Cloak of Darkness 2015-05-15 02:33:10 -04:00