Commit Graph

3054 Commits

Author SHA1 Message Date
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
ZomgPonies 6bfd92b16a Merge pull request #1061 from FalseIncarnate/wizard
Brooms, Stick-horses, and Flying Wizards!
2015-05-16 07:34:22 -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 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 d838b942a6 Fixes lighting runtime caused by AI upload computer 2015-05-16 00:31:04 -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
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
PJB3005 a5523e69b0 Better emitter admin logging & a couple minor tweaks 2015-05-15 18:23:17 +02:00
PJB3005 a901320238 Fixings 2015-05-15 17:06:51 +02: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
Tigercat2000 53249a9d13 FIX: Floodlights no longer have 999 range
This commit fixes the fact that floodlights had literally 999 range to
them, illuminating more tiles than were actually on the map. They now have
14 range, and 20 brightness to maintain functionality similar to that
which they had before the lighting overhaul.
2015-05-14 20:23:37 -07:00
Tigercat2000 21b1017178 Makes the white telecomm ship an actual movable shuttle 2015-05-14 14:55:22 -07:00
PJB3005 257e77c400 /vg/ Multitool menu port!
With 100% better squashing.

I hope.
2015-05-14 22:34:02 +02:00
ZomgPonies b93053141a Merge pull request #1027 from tigercat2000/fuckglobaldm
Global.dm, Setup.dm
2015-05-13 23:44:27 -04:00
Tigercat2000 993ad208a8 Overhaul global defines and vars
This commit overhauls the global.dm file, global_lists.dm file, and
defines.dm file into a tree system based on -tg-.

All defines have been split and distributed in code/__DEFINES/

Everything from global.dm and global_lists.dm has been split and
distributed in code/_globalvars

The _compile_options.dm file contains anything that absolutely, 100%, must
be initialized before world.dm.

Name definitions have been moved to code/_globalvars/lists/names.dm.

Other things to note
 - All instances of something.z == 2/1/3/5 have been replaced with easily
   configurable defines, labeled ZLEVEL_. The map include file can
   override these by defining custom ones in it's file, as it is at the
   top of the tree.
2015-05-12 20:48:38 -07:00
Tigercat2000 7d103f5bd5 Add light color defs for more things
This commit adds custom color definitions to almost every computer that
did not already have them. It also causes cigarretes to very dimly glow.

Also contains custom colors for candles, flashlights, and the mentioned
cigarretes.

Oh, and beepsky flashes red and blue now while in hunt mode. FTW
2015-05-12 05:27:28 -07:00
ZomgPonies f22ae3acbe Merge pull request #998 from tigercat2000/LightShit
Baystation12's Lighting Overhaul
2015-05-11 17:06:30 -04:00
Krausus c4d59070f6 Fixes camera upgrades not working properly
Important updates were being done in the malf AI's Upgrade Camera proc,
instead of in the actual upgrade procs
2015-05-11 08:17:08 -04:00
Krausus e54c4d07e5 Fixes setting airlock electronics for engieborgs 2015-05-11 07:00:10 -04:00
Krausus 9978831f0e Fixes AIs tracking people who show cameras papers 2015-05-11 06:51:07 -04:00
Krausus 64f39bb871 Fixes AIs and ghosts not being able to follow bots
This probably touches more files than it really should, but I can't
think of a better way to do it that isn't overhauling the saycode.
2015-05-11 06:38:14 -04:00
ZomgPonies 6aee3366ff Merge pull request #984 from tigercat2000/Pfixes
Pool Controller update: Hippie Edition
2015-05-10 17:45:56 -04:00
Tigercat2000 625dbb5295 Merge remote-tracking branch 'upstream/master' into LightShit
Conflicts:
	code/modules/hydroponics/trays/tray.dm
	code/modules/hydroponics/vines.dm
2015-05-10 13:56:28 -07:00
ZomgPonies 45d433c50c Merge pull request #982 from tigercat2000/anothergibberthing
Autogibber, Gibber patches
2015-05-10 16:07:21 -04:00
ZomgPonies 23b2fac794 Merge pull request #980 from FalseIncarnate/master
Botany / Xenobotany Update [Feature][Sprites]
2015-05-10 16:05:57 -04:00
Tigercat2000 e1249fc640 Lighting overhaul.
This commit overhauls the lighting system to Bay12 standards. It is better
in pretty much every way.
2015-05-10 12:03:27 -07:00
Tigercat2000 303aab7726 Pool Controller update: Hippie Edition
This commit updates the pool controller with some of the fixes that
HippieStation/Atlas added.

Things changed:
 - People will now drown in the pool if they are resting.
  - There are a few conditions.
  - They must not be wearing internals.
  - They must not be a skrell.
  - They must be a species that breathes
  - They must not have the NO_BREATHE power
 - AI's can no longer save people from burning in the pool with their
   magical field
  - Yes this was a thing, it would stop looking for mobs if it found an
     AI eye
2015-05-09 14:23:56 -07:00
Tigercat2000 597b15b850 Gibber: More logging, Autogibber fix
This commit adds the user name and ckey (where applicable) to the gibber
victim list.

victims = /list (1)
 - [12:27:52] unknown () killed by The unknown (tigercat2000) = null

victims = /list (1)
 - [12:26:56] Shadow Larkens (tigercat2000) killed by Autogibbing = null

This commit also fixes admin-vareditting the autogibber direction, it will
actually update it's linked turf now.
2015-05-09 12:28:54 -07:00
Tigercat2000 5549925516 Autogibber + Minor patches
This replaces the old autogibber with a spawnable version that is actually
an automatic gibber. This also fixes a few minor issues I did not notice
before with the gibber code. Namely, overlays getting messed up.

The gibber will now spit out things inside of it 1 by 1 instead of all at
once.
2015-05-09 12:07:05 -07:00
FalseIncarnate db9d9fc647 Botany / Xenobotany Update
Largely a port of https://github.com/Baystation12/Baystation12/pull/8038
(Credit to Zuhayr for his hard work on botany)

Breakdown of the port:
- Plant traits have been expanded drastically
- You want a bio-luminescent tomato that explodes into a cloud of acid
when thrown or stepped on? Or maybe a corn vine that entangles people
and injects them with mannitol and it's harvests that can be used as a
battery? Totally possible.
- Adds new random seeds! Replaces the egg-plant seed in the exotic seeds
crate from cargo with 2 of these.
- Literally random, they have randomly generated stats, chemicals, and
traits. Great for researching, and/or wasting cargo's supply points.
- Plant analyzers can now print off the last scan they recorded, meaning
you can distribute copies of the report to validate your claims of
having the dankest weed on station.
- Potatoes, carrots, watermelons, soybeans, and pumpkins can all be
sliced/diced/carved with ANY sharp object, such as knives, hatchets,
glass shards, and e-swords.
- This should give the chef a bit more room to make it look like he
actually is doing the work by slicing up fries by hand. The processor
still also works.
- New reagent: Wood Pulp
- Currently has no use in recipes, but any plant with this reagent in it
can be chopped into planks with a hatchet. Did someone order some
Ambrosia Deus planks?
- Also, vines with woodpulp are dense. You have been warned.

Now onto the stuff I did in addition to the stuff from Bay.
- Fixed typos where plasma was mistakenly called "phoron" in the port.
(Sorry bay)
- Replaced bay's botany mutation chances with our tiered mutation
system.
- Re-re-added tobacco, space tobacco, tea aspera, tea astra, coffee
arabica, and coffee robusta.
- Re-enabled the rolling of joints
- Made it possible to hand-roll cigarettes from tobacco / space tobacco.
(A requested / promised addition)
- Just like with joints, it will inherit any chems in the tobacco, has
the same reagent capacity as a joint, but looks and smokes like a cig
(lasts as long as the cigarettes) with a different name/description to
differentiate it from pre-made cigs.
- Corn can now be juiced in the grinder, in addition to grinding it.
Grinding corn will result in it's contained reagents (like corn starch),
while juicing corn will result in corn oil.
- Re-added the additional plant analyzer information when scanning trays
(displays age, weed level, etc)

Also cleaned up the recipes_microwave.dm file, removing the commented
out recipes that were distributed to the other machines during the
Kitchen Overhaul. Shortens the file a bit and makes it more readable.

I probably forgot stuff, so I will add things as I remember them / they
get pointed out.
2015-05-09 06:00:24 -04:00
ZomgPonies 1029e9afe1 Ports VG's DeityLink's new explosion method 2015-05-09 01:56:25 -04:00
ZomgPonies a75f608398 Should only spawn one of each hero 2015-05-07 00:09:04 -04:00
ZomgPonies cd17fa4fb4 Refactor and clean up code 2015-05-06 19:14:22 -04:00
ZomgPonies a02bb8a1ae Fix up show antagonist to list heroes and villains 2015-05-06 03:07:46 -04:00
ZomgPonies ee7e560919 Superhero Update 2015-05-05 17:13:16 -04:00
ZomgPonies d106462fa5 Merge pull request #796 from TheDZD/shadowling
Port of /tg/station's Shadowlings [WIP]
2015-05-04 20:38:20 -04:00
Tigercat2000 b14f7a429f Ventcrawling fixes
d3athrow/vgstation13#4251
tgstation/-tg-station#9296

 - Fixes moving between pipeline datums not updating pipe vision
 - Fixes login() not updating pipe vision
 - Removes hardcoded limit of entering through unary machinery-- does
   nothing *now*
 - Can see pipes in darkness as fullbright
 - More sanity checks
2015-05-03 09:19:27 -07:00
veganzombeh 79c084450a Various fixes 2015-05-01 17:54:30 +01:00
ZomgPonies 37fa1108d4 Merge pull request #895 from tigercat2000/okayletstrysomethingslightlydifferent
LINDA
2015-04-30 13:18:48 -04:00
Fox-McCloud 8f686aab46 Merge pull request #898 from SirBloodBuske/SirBloodBuske-Alarm-Deconstuct-Fix
Update alarm.dm
2015-04-30 03:09:34 -04:00
SirBloodBuske 797ec2377f Update alarm.dm 2015-04-29 23:52:09 -07:00
SirBloodBuske ae79fce8e8 Update alarm.dm
Fix'd spans
2015-04-29 23:42:43 -07:00
Tigercat2000 dfc74ebde6 Modify fire_act to temperature_expose where needed
This commit changes a bunch of objects fire_act's to temperature_expose,
to allow for superhot gas to act like an actual hotspot. This behaviour is
consistant with -tg-.
2015-04-29 16:56:12 -07:00