Commit Graph

16278 Commits

Author SHA1 Message Date
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
TheDZD
e4ca147d39 Merge pull request #1036 from ZomgPonies/mech
Mechas breakthrough
2015-05-14 19:44:20 -04:00
ZomgPonies
d62b3d3d77 Merge pull request #1040 from Robertha89/master
Anti-Meta
2015-05-14 09:45:34 -04:00
ZomgPonies
10db10584a Merge pull request #1038 from tigercat2000/corpor
MAP: Cyberiad, Corp jumpsuits, Engi curtains
2015-05-14 09:45:18 -04:00
ZomgPonies
b9420c61f7 Merge pull request #1035 from tigercat2000/LoyaltyTraitorStuff
Antag picker fairness
2015-05-14 09:05:27 -04:00
ZomgPonies
e8f41f764d Merge pull request #1053 from tigercat2000/SpaceWeaponpodPod
FIX: Spacepod null weapon firing runtime
2015-05-14 09:05:19 -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
Tigercat2000
1b72f6e199 FIX: Spacepod null weapon firing runtime
This commit fixes a runtime error with spacepods, which would happen when
someone tried to fire the weapons while the pod has no weapons.
2015-05-14 05:56:50 -07:00
Krausus
a5ee1a754d Fixes runtime in resist_holder() 2015-05-14 08:37:57 -04:00
Krausus
1e63811d0f Actually fixes medical item runtimes
They never checked whether the limb you're targeting actually exists,
which caused all sorts of runtimes all over the place
2015-05-14 08:28:41 -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
6b4d8ec0b3 Fixes medical item runtime and a line git ate
That line was pretty important, git. Why, git.
2015-05-14 07:23:26 -04:00
Krausus
a45bf57247 Fixes syndieborg op-pinpointer runtime
This thing still doesn't actually do any distance checks to find out who
the "nearest operative" is, but I'm just here for the runtime. Also, I
fixed the thing spawning never-ending threads, because whyyyy
2015-05-14 07:05:20 -04:00
Krausus
e9c32eefbe Fixes Check Bomb Impact runtime 2015-05-14 06:50:29 -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
Krausus
d74a016a1d Fixes add_logs runtiming
add_logs will now respect the admin argument, which determines whether
the attack goes into the file log and is shown to admins. Previously,
this argument didn't exist in our codebase, and ported add_logs calls
that used it would runtime.
2015-05-14 06:18:03 -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
Krausus
494ffc00a1 Fixes SQL death reporting runtime 2015-05-14 04:44:25 -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
1476c01c4e Fixes dirt overlay and cleans up Entered() 2015-05-14 00:52:02 -04:00
ZomgPonies
5531226247 Fixes colors runtiming. Oops. 2015-05-14 00:51:45 -04:00
Fox-McCloud
9df83c0310 Merge pull request #1046 from ZomgPonies/master
Adds checks for lighting overlays to Entered()
2015-05-13 23:54:09 -04:00
Fox-McCloud
72db556fc3 Merge pull request #1029 from ZomgPonies/color
Simpler color mixing
2015-05-13 23:46:57 -04:00
ZomgPonies
1f31bca234 Adds checks for lighting overlays to Entered() 2015-05-13 23:46:05 -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
ZomgPonies
0c9937982f Merge pull request #1007 from IAmBigCoat/test
Scrub/Supply pipe caps and a small schema fix
2015-05-13 20:50:07 -04:00
Robertha89
56b051fd0d Revert "Revert "Revert "Ready Cult runes of species blood color"""
This reverts commit d72910e558.
2015-05-13 22:55:53 +02:00
Robertha89
d72910e558 Revert "Revert "Ready Cult runes of species blood color""
This reverts commit 18eae7fb94.
2015-05-13 22:55:45 +02:00
Robertha89
18eae7fb94 Revert "Ready Cult runes of species blood color"
This reverts commit 1443dd201c.
2015-05-13 22:27:20 +02: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
Robertha89
1443dd201c Ready Cult runes of species blood color
the rune icons have been changes so you can apply color to them, with
code ready for someone to add a check and a pick for clood color.
2015-05-13 22:07:46 +02: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
Robertha89
036cbe39ab Anti-Meta
Updates crayon runes
http://i.gyazo.com/e98dc684ebd0a80711f7c796fb5aadbe.png
2015-05-13 17:56:57 +02: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
Tigercat2000
0a991322c3 MAP: Cyberiad, Corp jumpsuits, Engi curtains
This commit does the following:
 - Adds a corporate wardrobe to security, equipped with 3
   corporate jumpsuits and 3 corporate caps.
 - Changes the shower curtain on the engineering outpost from a regular
   curtain to an engineering curtain, because we have those now
2015-05-13 07:22:25 -07:00
ZomgPonies
f44897cc90 OH YEAAAAAAAAAAAH 2015-05-13 09:25:13 -04:00
Incoming
1bbff5abfe All modes now choose their antagonists before they choose jobs.
A new mind attached list, restricted_roles, will keep incompatible jobsout of rotation.

Players who would otherwise qualify to play as a protected role will spawn
as the most wanted not protected role they qualify for if they are an
onstation antagonist. If they don't qualify for any job in this way
depending on preferences they will either spawn as an assistant or a random
job (which also makes sure they don't end up in an incompatible job).

Note this doesn't impact late join antagonists or mulligan antagonists.
Roundstart only.
2015-05-13 06:14:00 -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