Commit Graph

256 Commits

Author SHA1 Message Date
Zuhayr
11a2b0eb3c Merge pull request #5792 from Whitellama/flavourtext
Dynamic Flavour Text
2014-07-28 10:11:02 +09:30
Whitellama
8f1417f14c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into flavourtext 2014-07-26 17:09:12 -07:00
Whitellama
bbc9150793 Updated body_parts_covered 2014-07-26 17:06:08 -07:00
Zuhayr
4ef8a08310 Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 2014-07-27 03:20:16 +09:30
Mloc-Argent
d5e9851b62 integrate XGM into the code
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 19:52:12 +01:00
Zuhayr
ff38aca774 Merge resolution. 2014-07-21 16:17:15 +09:30
Walter0o
7dff5f117e adds proper pAI language based translator,
reverts UNTRANSLATABLE
2014-07-20 09:05:44 +02:00
Zuhayr
3976433396 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-17 20:57:06 +09:30
mwerezak
005c6589c2 Limits hearing sounds in a vacuum 2014-07-15 15:30:10 -04:00
Zuhayr
ccb95c996c Made Vox-Pidgin and Rootspeak untranslatable even by pAIs. 2014-07-15 15:57:28 +09:30
Zuhayr
85b1bbe041 Merging work into dev. 2014-07-10 20:25:07 +09:30
mwerezak
a4c9f31b49 Fixes #5532 and increases the time required for organs to become infected from wounds
Also removes the now unnecessary get_cure_threshold() proc, caps the
rate at which an organ can receive germs from wounds, and makes germs
spread from external to internal organs happen one organ at a time
instead of all at once.
2014-07-07 17:01:15 -04:00
mwerezak
5948ed591e Reduces amount of toxin damage dealt by infections
Reduces the toxin damage dealt by non-necrotic infections by a factor of
1.5. Also increases the germ_level required to reach necrosis.
2014-07-06 11:19:19 -04:00
Zuhayr
b50d42d80c Cleaned up some reagent stuff, made Skrell alcoholics a legit issue, fixed IPC getting phoron contamination from clothing. 2014-07-01 01:03:50 +09:30
Zuhayr
19bb5014a9 More work on custom gear. 2014-06-29 04:22:09 +09:30
mwerezak
ac0bf7b853 Improves the implementation of non-verbal languages
Cleans out the nonverbal language check from say_understands(), which
now is responsible for language only.
Nonverbal languages have a chance of causing an emote when used.
Adds sign languages, which have no verbal component.
2014-06-28 12:19:34 -04:00
mwerezak
e80f42cad4 Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
Conflicts:
	code/setup.dm
2014-06-25 13:28:18 -04:00
mwerezak
25bcdfa39e Merge remote-tracking branch 'upstream/dev' into emergency-shuttle
Conflicts:
	code/setup.dm
2014-06-24 00:09:17 -04:00
mwerezak
d892099ea3 Adds direction arg for area/move_contents_to()
Attempts to fix shuttle corner transition effect
Fixes bad ETAs appearing on status displays
2014-06-23 23:51:47 -04:00
DJSnapshot
488c4f4b84 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into laptop
Conflicts:
	code/setup.dm
2014-06-23 00:25:39 -07:00
mwerezak
5305de5ecb Fixed misplaced prob(), added notes 2014-06-22 09:51:38 -04:00
DJSnapshot
9de9dab362 Initial commit of Computer 3 from Paradise, along with a bunch of fixes. 2014-06-22 02:08:42 -07:00
mwerezak
b9fa433087 Adds suit cooling device
Also:

Breathing in hot/cold air will affect your body temperature.
Fixes old body temperature stabilization code not working.
Thermometer icon now adjusts based on species.
Reduced BODYTEMP_AUTORECOVERY_MINIMUM to a less ridiculous value.
2014-06-21 16:53:18 -04:00
mwerezak
244b43c657 Infections now spread between organs
Infections can now spread between internal and external organs.
Also changes the organ_failure random event to cause an infection
instead.
2014-06-20 23:22:03 -04:00
mwerezak
cf5ff7e992 Body temperature fixes and updates
Body temperature regulation is now based on species, and environmental
temperature now respects the air density when affecting living/humans.
This also fixes some bugs with heat/cold protection handling and
improves the way synthetic species body temperatures are handled to be
much more logical.

IPCs always gain temperature but cool down because of their environment.
When the heat transfer to the environment is reduced because of the lack
of air, this will cause IPCs to heat up.

As well, having an infection will increase your body temperature, and
body scanners now detect infections.
2014-06-20 18:18:02 -04:00
mwerezak
82a85c2bae Tweaks wound infection a bit 2014-06-19 23:48:49 -04:00
mwerezak
d512d62869 Re-enables organ infections, adds wound infection 2014-06-19 21:25:59 -04:00
mwerezak
462593f0b5 Adds supply shuttle datum 2014-06-18 19:37:30 -04:00
Mloc-Argent
9896e44d8a Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/unsorted.dm
2014-06-12 18:56:26 +01:00
Ravensdale
1fe53510ed Merge branch 'master' of https://github.com/Baystation12/Baystation12 into freeze-master-merge 2014-06-12 05:04:28 -07:00
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
Boop
168c39dd54 refactors some disposals filtering code and remaps some disposals pipes
New things!
/obj/structure/disposalpipe/tagger
 - retags a holder when it passes through
/obj/structure/disposalpipe/tagger/partial - retags a holder when it passes through two times; good for loop detection
/obj/structure/disposalpipe/sortjunction/wildcard - filters out all holders that are tagged
/obj/structure/disposalpipe/sortjunction/untagged - filters out untagged holders

Tagging doesn't use an icky list index system any more, tags are put into a global list and directly checked against.

Changed the map around a bit, disposals is now a proper loop but anything that's not tagged, is tagged with "Disposals" or anything that passes the tagger twice will be filtered out.

Not a feature, just a fix for drones being sad about weird disposals. <3
2014-06-01 23:30:20 +01:00
Chinsky
189c160c07 Merge pull request #5092 from Ravensdale/dev-freeze
Fixes accidental renames during Phoron project
2014-05-31 05:22:07 +04:00
Mloc-Argent
3d2cc3cd82 Revert "Merge pull request #4985 from jack-fractal/dev"
This reverts commit 1679b4062f, reversing
changes made to b149b273d9.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/datums/visibility_networks/update_triggers.dm
2014-05-31 00:25:56 +01:00
Ravensdale
ea07c973be Clarifies comment wording
Small things
2014-05-30 04:10:17 -07:00
Ravensdale
167fae9cf4 Fixed accidental rename during Phoron project 2014-05-30 03:05:50 -07:00
Jeremy Liberman
d3541d1e08 Merge branch 'dev' into mutiny 2014-05-25 14:22:16 -05:00
Ccomp5950
0ca4aaa316 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev 2014-05-24 19:03:51 -05:00
Jeremy Liberman
a95a28e303 Merge branch 'dev' into mutiny-fixes 2014-05-18 11:25:36 -05:00
Zuhayr
e3f0bcd118 Adds PASSEMOTES flag to setup.dm, dionaea and borers. 2014-05-18 10:50:13 +09:30
mwerezak
7d1c5e7824 Adds non-verbal languages 2014-05-17 08:51:35 -04:00
Zuhayr
1679b4062f Merge pull request #4985 from jack-fractal/dev
Masks of Nar'sie - Testing Version
2014-05-17 14:01:00 +09:30
Zuhayr
429684d5ac Squashed armalis/vox commits and human icon update commits:
Armalis gear and mob icons, plus sonic cannon.
Added sonic cannon skeleton code.
Noise cannon fire sound, Vox shriek sound.
Added Vox Armalis species.
Swapped vox breath mask over to species_restricted check.
Added Vox Armalis gear.
Added a random shriek effect to Vox and Vox Armalis speech.
Added quickspawn Vox Armalis definition.
Vox shriek sound effect. Thought I committed this earlier.
Added r_hand and l_hand icon_overwrite checks.
More work on Armalis. Added gut() and leap() human procs.
Adding/fixing up the leap() and gut() verbs, and a LEAPING status_flag for human/Bump().
Fixing some missing pixels in the armalis tail.
Almost forgot to whitelist armalis...
2014-05-15 14:30:37 +09:30
jack-fractal
1bd866239f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mask-storage
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/cult/runes.dm
	code/game/machinery/doors/door.dm
2014-05-13 20:45:05 -04:00
Jeremy Liberman
d23340a49b Mutiny Mode 2014-05-11 15:03:50 -05:00
Mloc-Hibernia
f2924c9f57 Merge remote-tracking branch 'upstream/dev' into bs12-zuhweapons 2014-05-11 13:48:51 +00:00
Mloc-Hibernia
e3a8d5eb43 Merge remote-tracking branch 'upstream/master' into dev
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com>

Conflicts:
	code/game/objects/effects/spawners/bombspawner.dm
2014-05-11 13:19:09 +00:00
Zuhayr
ff56d3e1bb Added drone fabricators to the map in their own area. Replaced Vox crossbows with spike throwers. 2014-05-11 21:38:29 +09:30
Zuhayr
a68c4e9c55 Fixes #3993 2014-05-10 10:26:05 +09:30