Commit Graph

16487 Commits

Author SHA1 Message Date
ZomgPonies
41bc4eed31 Merge pull request #1156 from Fox-McCloud/spess-dogs
New Race: Canine Race--Vulpkanin
2015-05-25 04:43:04 -04:00
Fox-McCloud
c262be4d30 dun dun dun 2015-05-25 03:42:24 -04:00
Fox-McCloud
c4ff24110d Merge pull request #1158 from TheFlagbearer/Theflagbearer-customitems
Custom Items - The Flagbearer
2015-05-25 01:13:28 -04:00
Fox-McCloud
ebf021736f tweak 2.0 2015-05-25 00:50:47 -04:00
Tigercat2000
2218d8c0ab Fix some minor issues with pod doors and buttons 2015-05-24 20:25:13 -07:00
Fox-McCloud
95a06fa165 updates and tweaks 2015-05-24 20:17:17 -04:00
Fox-McCloud
bc3ecd68c6 Removes Nanomachines 2015-05-24 18:31:12 -04:00
TheFlagbearer
b6198ab506 Custom Items - The Flagbearer
Not entirely sure if I'm allowed to create a PR for my fluff items but someone suggested I should instead of waiting. Anyway, this PR adds my fluff items.
2015-05-24 14:05:47 -04:00
Zuhayr
ebad5e668b Partial fix for #8825
Conflicts:
	code/modules/organs/organ_external.dm
	code/modules/organs/organ_icon.dm
2015-05-24 11:25:09 -04:00
ZomgPonies
9e56424d74 Merge pull request #1151 from Krausus/FollowThatEye
Adds ghost-following and admin-jumping for AI eyes and ghosts' bodies
2015-05-24 10:19:12 -04:00
ZomgPonies
16668e5812 Merge pull request #1150 from FalseIncarnate/master
Botany Atmospheric Interactions
2015-05-24 10:19:01 -04:00
ZomgPonies
f3195c3c6e Merge pull request #1148 from Fox-McCloud/speciesist
Removes Speciesist Objective
2015-05-24 10:18:49 -04:00
Fox-McCloud
cfe55ed0e3 spelling and grammar 2015-05-24 01:44:23 -04:00
Fox-McCloud
1b4c3f797d touch-ups 2015-05-24 01:35:52 -04:00
Fox-McCloud
791ebc0b7f New Race: Canine Race--Vulpkanin 2015-05-24 01:00:19 -04:00
ZomgPonies
0a2280e3ef Merge pull request #1155 from Fox-McCloud/janitor
Janitor--Bar of Soap
2015-05-24 00:50:49 -04:00
ZomgPonies
46d9148fd7 Merge pull request #1146 from Fox-McCloud/Virus-Tweaks
Virus Tweaks
2015-05-24 00:50:13 -04:00
Krausus
f4a4d1995f Adds ghost-follow/admin-jump-to for ghosts' bodies
Also removes the extra arguments from admin_jump_link, because I didn't
end up needing them anyway.
2015-05-24 00:10:26 -04:00
Fox-McCloud
8e11d0ec6a Merge pull request #1142 from tigercat2000/ambi
Makes Area Ambience a list on the area, Maintnance ambience
2015-05-23 20:57:03 -04:00
Fox-McCloud
5b26b1ca59 Janitor--Bar of Soap 2015-05-23 20:50:12 -04:00
Fox-McCloud
abed5764d0 fixin' 2015-05-23 20:13:25 -04:00
Fox-McCloud
da64573239 oops 2015-05-23 19:56:03 -04:00
tigercat2000
9173f1056a Revert "Adds area generators to build mode" 2015-05-23 07:39:14 -07:00
Krausus
a47357ae5d Adds AI eyes to ghost jump/follow verbs 2015-05-23 10:15:41 -04:00
ZomgPonies
073eaddfa9 Merge pull request #1134 from tigercat2000/BUILDINMODEIN
Adds area generators to build mode
2015-05-23 10:09:02 -04:00
ZomgPonies
8ed29366c6 Merge pull request #1149 from IAmBigCoat/serverPipes
Server pipes
2015-05-23 10:06:01 -04:00
ZomgPonies
77d8d607f3 Merge pull request #1144 from Fox-McCloud/movement-changes
Movement Changes
2015-05-23 10:04:35 -04:00
ZomgPonies
5623efa919 Merge pull request #1143 from Fox-McCloud/LINDA-Fixins
Even more LINDA Fixes
2015-05-23 10:03:37 -04:00
Krausus
6ba24c8069 Adds admin_jump_link and AI eye jumping
Also fixes a little mistake in ghost AI eye following.
2015-05-23 09:50:38 -04:00
Krausus
f5be679752 Adds ghost_follow_link and AI eye following 2015-05-23 08:54:13 -04:00
FalseIncarnate
4ad00d93a5 Botany Atmospheric Interactions
Re-enables botany's interactions with atmospheric conditions and gases.

Seeds can now consume and exude gases as part of their growth process.
Most seeds do not have this functionality, however it can be found on
random seeds.

Random seeds will occasionally require a gas to grow, or will produce a
gas while planted. Possible gases are Oxygen (O2), Nitrogen (N2), Carbon
Dioxide (CO2), or Plasma gas.

If a plant that affects a gas is planted, it will attempt to interact
with the environment differently depending on conditions as detailed
below:

- Tray lid down: Will always utilize the air of it's tile for atmos
interaction.
- Tray lid up, nothing connected/inserted: Will utilize the air of it's
tile for atmos interaction.
- Tray lid up, tray connected to a connector port pipe: Will attempt to
utilize the air of the pipe network the connector is part of, allowing
you to utilize canisters or direct feeds into the station's piping. If
there are no gases at all (0 total moles) in the network, it will create
an empty gas_mixture at 20C (standard room temp) in the network before
attempting atmos interactions.
- Tray lid up, tank inserted into tray: Will attempt to utilize the
contents of the inserted tank for atmos interaction. If the tank is
completely empty (0 total moles), it will create a new empty gas_mixture
at 20C before attempting atmos interactions.
- Tray lid up, tank inserted AND connector port: Will attempt to utilize
the contents of the inserted tank for atmos interaction. If the tank is
completely empty (0 total moles), it will create a new empty gas_mixture
at 20C before attempting atmos interactions. (Pretty much just ignores
the connector port)

In case it wasn't apparent from the above mentions, you can now insert
any portable tank (emergency oxygen, plasma tank, pretty much any tank
that could be hooked up to internals) into a hydroponics tray. You can
remove them with the previously added eject internal tank verb. There is
currently no visual indication of whether or not there is a tank
inserted (the tray icons are already cluttered with the sheer number of
overlays, and I didn't want to sprite another monstrosity like my past
spriting attempts yielded)

When utilizing an inserted tank for the plant's atmos interactions, it
will attempt to use distribution pressure set on the tank for the
atmospheric pressure inside the closed lid. If the tank's internal
pressure drops lower than the distribution pressure, it will use the
tank's internal pressure instead.

The alter temperature trait is now functional, and will heat/cool the
air used for the plant's atmos interactions. This means it can heat/cool
the surrounding air, inserted tanks, or the contents of a connected pipe
network.

Plant analyzers have had their readouts updated to report what (if any)
gases the plant consumes or produces during it's life. Also edited the
alter temperature trait's message on the plant analyzer to not
incorrectly refer to the change in "degrees Kelvin".

There may be a bit of wonkiness with open-air atmos interaction and gas
redistribution, which would be an issue with LINDA's processing and not
the changes in this PR.

Also, a major reminder that atmos grief is a bannable offense, and
releasing plasma-producing vines into the halls will be considered equal
to causing an atmos flood from atmospherics and dealt with accordingly.
2015-05-23 07:43:31 -04:00
Fox-McCloud
904c4c62c9 Removes Speciesist Objective 2015-05-23 03:25:44 -04:00
Fox-McCloud
d0d5b167d2 removed--no fun allowed on paradise. 2015-05-23 02:47:33 -04:00
Fox-McCloud
4702df3a49 tweaks. 2015-05-23 01:08:42 -04:00
IAmBigCoat
57569e8ab4 Merge branch 'master' into serverPipes 2015-05-23 00:10:21 -04:00
Fox-McCloud
bff89fa125 Merge pull request #1129 from PJB3005/master
TeG & SM crates in cargo, SM temp increase.
2015-05-22 23:44:27 -04:00
IAmBigCoat
cdc10b2178 Adding area adjustment.
Need to add servercold to areas.dmi and re-add the mapd
2015-05-22 23:41:10 -04:00
Fox-McCloud
0f0a7c7985 Virus Tweaks 2015-05-22 23:18:59 -04:00
Krausus
cbab720dd7 Fixes uploading books to the library database 2015-05-22 22:14:08 -04:00
Fox-McCloud
0e5b04e130 Movement Changes 2015-05-22 20:59:24 -04:00
Fox-McCloud
fa051ff1ff Even more LINDA Fixes 2015-05-22 20:26:55 -04:00
Tigercat2000
002fb9f947 Makes Area Ambience a list on the area, Maintnance ambience
This commit refactors the area ambient sound system to pick from a list
defined on the area definition itself instead of a lengthy else-if change.
This is mostly noticable to people making new areas or modifying area
ambient sounds.

This commit also adds 5 maintnance ambient sounds from -tg-.
2015-05-22 16:15:50 -07:00
Fox-McCloud
6884e593dd Merge pull request #1139 from tigercat2000/spacearea
Replace all instances of /area alone to /area/space
2015-05-22 18:42:08 -04:00
ZomgPonies
c8f9aa0c33 Merge pull request #1140 from Fox-McCloud/tweaking-stuff
Tweaks and Fixes 2.0
2015-05-22 17:24:29 -04:00
ZomgPonies
2d1b8f422e Merge pull request #1128 from Fox-McCloud/LINDA-Fixes
More Linda Fixes
2015-05-22 17:22:20 -04:00
Fox-McCloud
9eae10ef28 Merge pull request #1141 from tigercat2000/morelindacri
REFIXOR: Turf Gas Visuals
2015-05-22 17:17:28 -04:00
TheDZD
67fd1bb8fd Merge pull request #1123 from Fox-McCloud/cyborg-tweak
Cyborg Tweaks
2015-05-22 17:06:06 -04:00
Tigercat2000
42dff8d095 REFIXOR: Turf Gas Visuals
This commit does the following:
 - Adds a missed call to simulated/update_icon() to update the atmos
   visuals
 - Fixes plasma not showing up on engine floors on New()
2015-05-22 14:03:47 -07:00
Fox-McCloud
8bdc09ad38 Merge pull request #1111 from ArgyleSweatshop/patch-2
Make Sake,Kahlua, and Soy Sauce Recipe more realistic
2015-05-22 17:02:15 -04:00
Fox-McCloud
db442b4486 RCD Fix 2015-05-22 16:55:41 -04:00