Commit Graph

9553 Commits

Author SHA1 Message Date
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
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
ZomgPonies
7ba6adb829 Merge pull request #1052 from Krausus/Runtimes-201505140426
Runtime (and an infinite loop) Fixes
2015-05-14 09:05:05 -04:00
Krausus
a5ee1a754d Fixes runtime in resist_holder() 2015-05-14 08:37:57 -04:00
Krausus
f45737c097 Fixes animal milking runtime
Also simplifies the way milk is generated, since the old way was hacky
and runtiming
2015-05-14 08:14:23 -04:00
Krausus
106712fff6 Fixes bot following fix runtime
Oops.
2015-05-14 07:27:55 -04:00
Krausus
9575d61836 Fixes hand removal runtime
Unlike feet, removed hands wouldn't check to make sure they had an owner
before trying to remove the thing they were wearing on them.
2015-05-14 06:49:05 -04:00
Krausus
b702d5d974 Fixes human ex_act infinite loop
If an explosion wanted to remove more non-vital limbs than a human had,
it would infinitely loop trying to find another limb to remove.
2015-05-14 06:47:09 -04:00
ZomgPonies
6178fbb32e Fix 2015-05-14 06:01:49 -04:00
ZomgPonies
06a1510766 Optimizes stuffs 2015-05-14 05:36:13 -04:00
Krausus
b89c01391a Fixes IPC death runtimes
These seemed to happen consistently when they were EMP'd to death
2015-05-14 05:06:11 -04:00
Krausus
9a936944a3 Fixes Jump To Area runtime
Trying to jump to an area with no associated turfs would runtime
2015-05-14 04:56:03 -04:00
FalseIncarnate
498aad09cb Empty Slices Fix
Fixes watermelon slices being empty.

Potatoes, carrots, and watermelons will now properly transfer their
reagents to the new slices when chopped/sliced, divided evenly across
the total number of slices.

Watermelons create 5 slices, carrots and potatoes only create 1 (since
they are a plate/pile of fries/sticks).
2015-05-14 02:07:35 -04:00
ZomgPonies
5531226247 Fixes colors runtiming. Oops. 2015-05-14 00:51:45 -04:00
Fox-McCloud
72db556fc3 Merge pull request #1029 from ZomgPonies/color
Simpler color mixing
2015-05-13 23:46:57 -04:00
ZomgPonies
b93053141a Merge pull request #1027 from tigercat2000/fuckglobaldm
Global.dm, Setup.dm
2015-05-13 23:44:27 -04:00
ZomgPonies
a4501413cd Merge pull request #1025 from FalseIncarnate/master
[Fix][Feature?] Botany Fixes and Telescopic Scythes
2015-05-13 22:56:15 -04:00
FalseIncarnate
719b98f43f Diona Nymph and Light Level Fixes
- Fixes Diona Nymphs getting a color overlay, which was causing them to
become darker and look terrible.
- They now look like they did pre-#980

- Adjusts the equation for hydroponics trays calculating light level
based on their turf (lid down)
- All trays in hydroponics should now have a light level of 3 or higher,
this is subject to further adjustments to fine-tune

- Fixed messages from the eject tank verb to not say things like "the
the tray (#45)"
2015-05-13 16:14:46 -04:00
Tigercat2000
be8f4b56a2 Fix ventcrawling, Fix packages qdelling things
This commit fixes a couple bugs with ventcrawling, and makes packages work
correctly again, instead of just qdelling themselves.
2015-05-13 11:37:11 -07:00
Tigercat2000
5b7ec52ecd Update simulated var to bay12 refactors
This commit refactors the simulated var to a missed update from bay12,
which prevents the singularity or explosions from breaking lighting.
2015-05-13 07:49:51 -07:00
ZomgPonies
ed8e0c7581 Merge pull request #1018 from tigercat2000/OhMyLights
Add light color defs for more things
2015-05-13 08:06:14 -04:00
ZomgPonies
a35bee860d Simpler color mixing 2015-05-13 00:01:32 -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
ZomgPonies
83efddc699 All lightbulbs in light explosion damage range break 2015-05-12 23:08:42 -04:00
FalseIncarnate
b602e3d5e3 Botany Fixes and Telescopic Scythes
- Ports https://github.com/Baystation12/Baystation12/pull/9184 from
Baystation

- Prevents deconstruction of soil and invisible soil
- Fixes #1011

- Adds a verb to eject tanks from hydroponics trays if one is inserted
- Don't think anyone has actually done this, but it has been possible
for a LONG time and will be more useful once I get the atmos portion of
botany working

- Fixes grown items not leaving behind their trash
- Notably banana peels and corn cobs. Clowns and hillbillies rejoice!

- Adds 15% chance for a watermelon to leave behind a pack of it's seeds
when eaten.
- Slicing watermelon will not produce seeds ever

- Replaces the Janitorial ERT members' plant-b-gone sprays with new
Telescopic Scythes!
- Can be collapsed to fit on a belt or fit in pockets/bags
- While collapsed, it loses a large amount of it's damage, is not
considered sharp or as having an edge, and cannot cut vines like a
normal scythe. Extended ones are functionally identical to normal
scythes
- Extending and collapsing a telescopic scythe has some awesome sounds
from Freesound.org
2015-05-12 23:00:02 -04:00
Tigercat2000
f85be9e742 Fix: Event manager list index out of bounds
This commit prevents a runtime of "list index out of bounds" with events
by adding a simple sanity checking system, so that the list checked always
has a valid check, regardless of if the event has a valid variable. NOTE:
May result in unintended behaviour if an event tries to complete with an
invalid severity level. It will always be set to moderate, as that is a
safe assumption for the code to make.
2015-05-12 18:33:24 -07:00
Tigercat2000
b192bfd34c Fix: Space turf depressure, admin del
This commit fixes some special cases where a certain series of events
could lead to a space turf being created which was not activated in LINDA,
therefore it would not drain atmos correctly.

Things changed:
 - ChangeTurf properly updates new space tiles
 - Admin delete calls changeturf instead of del'ing turfs to satisfy LINDA
 - Admin delete now uses qdel instead of del, because everything is being
   switched to qdel.
2015-05-12 18:15:55 -07:00
TheDZD
6bdb1af83d Merge pull request #1022 from ZomgPonies/gui
Allows GUI buttons for accessories
2015-05-12 20:11:41 -04:00
ZomgPonies
4c043396a9 Merge pull request #1023 from tigercat2000/Somebugs
Get_Area(), Event, and grab fixes
2015-05-12 20:11:32 -04:00
Tigercat2000
3a6ab84e83 Get_Area(), Event, and grab fixes
This commit fixes the following things:
 - Get_Area() now properly returns the area
 - Events will no longer runtime upon being manually triggered by an admin
 - The prison break event works again
 - Grabbing will no longer runtime (May result in people with pixel
   offsets from a grab being stuck, better than a runtime)
2015-05-12 17:04:28 -07:00
ZomgPonies
396dc7c00b Was missing an important bit 2015-05-12 20:04:18 -04:00
ZomgPonies
a26cda2fa1 Allows GUI buttons for accessories 2015-05-12 19:23:17 -04:00
ZomgPonies
1dea1acbb9 Cleanup 2015-05-12 18:33:40 -04:00
ZomgPonies
825f4c1c06 Mob login runtime fix 2015-05-12 18:07:30 -04:00
ZomgPonies
59cef3fa73 Merge pull request #1013 from Fox-McCloud/infra-red
Infrared Beam Useability
2015-05-12 17:58:23 -04:00
ZomgPonies
a1d2f1e5f4 Merge pull request #1012 from tigercat2000/SpaceCube
Slice up Cyberiad.dmm, Spacecube transitioning.
2015-05-12 17:58:12 -04:00
TheDZD
a30d5953dd Merge pull request #1017 from ZomgPonies/superfix
Couple of superhero fixes
2015-05-12 15:11:51 -04:00
ZomgPonies
bd71606cf6 Merge pull request #1010 from tigercat2000/GAAB
Generic Action/Action Button System
2015-05-12 14:35:36 -04:00
ZomgPonies
c29d2f4dac Merge pull request #1008 from tigercat2000/VcrawlFixes
Generic ventcrawling + Bugfixes
2015-05-12 14:35:01 -04: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
2a0dcedd64 Couple of superhero fixes 2015-05-12 08:10:04 -04:00
Fox-McCloud
5fe4b0db02 Merge pull request #1015 from ZomgPonies/library
Library Fixes
2015-05-11 23:49:13 -04:00
ZomgPonies
0cf968785f Added rules to upload computer, better logging, cleaned out DB of non-fluff books 2015-05-11 23:28:32 -04:00
Tigercat2000
741da037fb Prevent divide by 0 runtime, fix supply shuttle
This commit adds a small sanity check to the falloff calculations of
lights, to prevent them from dividing by 0. This may cause undiscovered
strangeness, but strangeness is better than filling the runtime log.

This commit also fixes the supply shuttle, which was not spawning any
ordered items. It did this because it had a very basic contents.len check
which the lighting overlays triggered. The sanity check to not spawn stuff
on top of other stuff is now a for(atom) loop on the turfs, which has
snowflake checks for lights and lighting overlays.
2015-05-11 19:37:15 -07:00
ZomgPonies
e8782f90bd Merge pull request #1003 from Fox-McCloud/sound-tweak
Black Powder Sound Tweak
2015-05-11 21:54:31 -04:00
Fox-McCloud
c21777b4de Infrared Beam Useability 2015-05-11 18:22:09 -04:00
Tigercat2000
e1fad29990 Merge remote-tracking branch 'upstream/master' into SpaceCube
Conflicts:
	maps/cyberiad.dmm
2015-05-11 14:55:01 -07:00
ZomgPonies
884fb4e4ca Merge pull request #981 from tigercat2000/ContextBasedGrab
Context-Based: Grab Intent (Bayport)
2015-05-11 17:44:33 -04:00
Tigercat2000
7ca4eeb703 Fix headbutting and remove drawback 2015-05-11 14:43:45 -07:00
ZomgPonies
303a664f78 Merge pull request #1000 from Fox-McCloud/species-touchup
Species Touchups
2015-05-11 17:06:52 -04:00