Commit Graph

22199 Commits

Author SHA1 Message Date
Fox-McCloud
65c8070ec8 Spraybottle Changes 2015-05-17 18:43:57 -04:00
FalseIncarnate
7ac9b2fd51 Wizard Den Map-fix
Unexplainable magic turned the wizard den's staves into energy guns
during the broom riding port. This has been corrected, making them
staves again.
2015-05-17 18:33:11 -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
Fox-McCloud
90d6b382a6 Merge pull request #1088 from Krausus/TurfEnteredFix
Fixes Horrifying Loop in Simulated Turfs
2015-05-17 00:02:31 -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
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
7b0f6c6c62 Merge pull request #1085 from tigercat2000/NOSHEETSNO2
White ship Pod-bay
2015-05-16 16:24:39 -04: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
ZomgPonies
330fce9f93 Merge pull request #1086 from tigercat2000/WHOOPWHOOPWHOOPWHOOP
Apply new antag-restricted-roles stuff to traitorchan
2015-05-16 16:15:13 -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
Tigercat2000
8897e71200 White ship podbay
The white ship podbay is now an actual podbay, instead of a mass-driver.
2015-05-16 11:31:59 -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
ZomgPonies
66a18700f3 Merge pull request #1079 from Krausus/RuntimeFixes-201505160020
Runtime Fixes
2015-05-16 07:33:31 -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
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
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
023fc200bb Fixes runtimes from pAI attacks
pAIs inherited UnarmedAttack from /mob/living, which caused them to
attempt to attack_animal() things they clicked, which would generally
runtime on account of not having the variables expected from a
simple_animal.
2015-05-16 03:56:51 -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
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
Krausus
2e2249d6f8 Fixes global_announcer runtime (poorly)
Load order changes mean globals used in the initialization of intercoms
aren't created before the global_announcer intercom is created, which
causes its creation to runtime.

I have picked an effective but probably incredibly sloppy way to fix
this runtime, because I'm not actually sure where this initialization
code belongs
2015-05-16 01:19:15 -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
Fox-McCloud
ce2d3bb586 Merge pull request #1075 from ZomgPonies/master
Add ALL the sanity
2015-05-15 23:15:40 -04:00
ZomgPonies
6a84ea02a8 Add ALL the sanity 2015-05-15 23:09:09 -04:00
Fox-McCloud
c531b745b5 Merge pull request #1074 from ZomgPonies/master
Fix space cleaner 'cleaning' lighting
2015-05-15 23:04:51 -04:00
ZomgPonies
b58b31e7cd Fix space cleaner 'cleaning' lighting 2015-05-15 22:59:38 -04:00