Commit Graph

8881 Commits

Author SHA1 Message Date
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
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
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
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
ZomgPonies
1476c01c4e Fixes dirt overlay and cleans up Entered() 2015-05-14 00:52:02 -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
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
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
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
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
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
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
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
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
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
Krausus
159a12bc64 Fixes mech and pod fabricators
I have no idea how this code ever worked in the past.
2015-05-12 03:37:37 -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
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
ZomgPonies
1b9cd2dfe4 Merge pull request #999 from Fox-McCloud/hiding
Potted Plant Hiding
2015-05-11 17:06:40 -04:00
ZomgPonies
f22ae3acbe Merge pull request #998 from tigercat2000/LightShit
Baystation12's Lighting Overhaul
2015-05-11 17:06:30 -04:00
Tigercat2000
d98bf2d958 Spacecube transitioning
This commit adds the spacecube system from -tg-. The spacecube system
allows for predicatably random space layouts- it is randomized every
round, but the transitions stay consistant for that round, therefore
making it possible to 'map' space, or explore in teams.
2015-05-11 12:43:10 -07:00
AnturK
568d289a67 Generic Action\Action Button System
This commit ports the GAABS from -tg-station13. The GAABS allows for
generic, movable, hud elements for spells, powers, and items.
2015-05-11 09:32:08 -07:00
Krausus
035b873c0e Fixes missing alien-on-space pod attack cooldown 2015-05-11 09:23:50 -04:00
Krausus
9d712fe623 Fixes pill bottles not grouping their contents 2015-05-11 09:11:11 -04:00
Krausus
65ce3e4c20 Fixes numbered contents grouping different things
Also fixes a runtime from the black powder fix. Whoops!
2015-05-11 08:53:14 -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
ae864b0a2e Fixes captain's medal of captaincy spawning wrong 2015-05-11 07:35:41 -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
Tigercat2000
5ff292fe47 Flashlight icon fix
I left out an icon-updating line. Whoopsies.
2015-05-10 20:41:46 -07:00