Commit Graph

20501 Commits

Author SHA1 Message Date
NanakoAC
e70157ebfc Botany Tweaks (#389)
Watering hydroponics trays with a bucket of water will no longer waste
the excess water.
Fertilizer bottles now contain 60u. Amounts in vendors and biogenerator
cost adjusted appropriately
2016-06-20 17:34:30 +03:00
Alberyk
ea0e6114c8 Adding skrell snacks to the vending machine (#395)
Before, you could only get those by hacking the machines.
2016-06-20 16:14:14 +03:00
Alberyk
e9c0dce6cf Adding more options to the custom loadout (#401)
Adding regular gloves for tajaran and unathi, besides the Synthetic Intelligence Movement armband and the return of the wallet.
2016-06-20 16:13:42 +03:00
NanakoAC
e5d64716c2 Plantbag fixes (#388)
Fixed icons getting stuck onscreen when emptying a plantbag into a
biogenerator or grinder
Increased the biogenerator's capacity to be able to hold an entire plant
bag. because it's a giant stationary machine and the small capacity was
nonsensical
2016-06-20 16:12:33 +03:00
NanakoAC
4e61099040 Vomiting Overhaul (#365)
Centralises vomiting code to remove duplication and standardise effects.
Makes vomiting empty your stomach a bit (30u, the capacity of a drink
glass)
Adds Ipecac, an emetic to cause vomiting
2016-06-20 15:49:44 +03:00
NanakoAC
3df0610edd Fixed various instances of toxin being named phoron (#333)
* Fixed various instances of toxin being named phoron

These changes intended to reduce confusion, by fixing a few instances of
phoron being referred to as 'toxin', which i believe is a legacy
holdover from some bygone time.

*The biggest and most important change here, is that now when a mob
breathes a gas that's toxic to them, that gas is what's put into their
bloodstream, instead of the generic 'toxin'. This is so that blood tests
can actually be functional to find out what happened to the patient,
instead of only telling that the blood contained 'toxin'
*The toxin strength of phoron has been lowered to 4, so as not to make
people die any faster from phoron poisoning. This strength value only
affects it being injected into the blood, which is never done, or it
being inhaled.
*All references to 'Toxin' in Air Alarm interfaces have been changed to
phoron, they have always meant phoron only.
*In the core cooling computer, the abbreviation of phoron has been
changed from Tx to Ph
2016-05-31 01:10:13 +03:00
NanakoAC
78c8951030 Cyborg beakers and grippers (#338)
* Fixing Borg Beakers

*Crisis and Research borgs now have a Chemistry Gripper instead of a
beaker. The gripper can hold beakers, bottles, pillbottles, pills, hand
labellers, and phoron crystals
2016-05-31 01:09:31 +03:00
NanakoAC
0f68f828ff Fixed sleepers and buckle duplication (#345)
* Fixed sleepers and buckle duplication

Fixed a bug where buckled people could be placed into multiple machines
simultaneously
Medical machines will now unbuckle a patient before accepting them.
Fixed dialysis beaker being ejected from sleeper beds
Dialysis beaker can now be checked and ejected while a sleeper is empty
2016-05-31 01:07:56 +03:00
skull132
bf45c9e872 Dev Bug-fixes (#354)
* Runtime Fix - parse_db_lists()
Type mismatch.

* Remove Debug
Debug verbs from SQL saving.
2016-05-31 00:43:13 +03:00
skull132
b512cf7094 Tweaks Filtering and Toxic Gases (#353) 2016-05-31 00:18:57 +03:00
NanakoAC
ec5aec30f7 Fixed Unstable Mutagen chance (#343)
* Fixed Unstable Mutagen chance

This fixes the mutation chance of unstable mutagen, to behave as the
author intended.

It also adds a little RP message to give some feedback
2016-05-31 00:14:41 +03:00
skull132
39bf9b2304 Fixes #299 (#352) 2016-05-30 23:48:03 +03:00
skull132
7dacaa28dd SQL Saving - Rewrite + Implenetation (#350)
Rewrite's Mahzel's SQL character and preference saving.
Introduces easy config switching between the new and old system, with no troubles at all.

Also introduces better logging for DBQuery/proc/parseArguments(), should something go wrong. And classes SQL query errors as full on error snow, as opposed to debug data.
2016-05-30 23:39:07 +03:00
NanakoAC
6881213b75 Nutrition Rearranging, Skrell and Unathi diets (#331)
* Nutrition Rearranging, Skrell and Unathi diets

*Rearranged nutrition code a little - Added a Digest proc and put the
three stat changing lines in there (blood, nutrition, healing) to
standardise it. and reduce code duplication
*Added blood_factor and regen_factor variables to nutriment, to easily
set how much bloodrestore or healing an inherited food will do. This
reduces numeric literals in code
*protein now has a blood factor of 12 instead of 6
*Unathi now cannot digest nutriment, it will do nothing.
*Added seafood protein as a descendant of protein.
*Skrell can safely eat seafood protein (By Senpai Jackboot's request)
*Space Carp, and all recipes made with carp fillets, now contain seafood
protein instead of animal protein, and thus are safe for skrell to eat.
*Skrell are now immune to carpotoxin

* Altered Carpotoxin immunity

After feedback from senpai jackboot, carpotoxin is taken away from
skrell, and given to unathi instead.
2016-05-30 23:29:56 +03:00
Lord Lag
8a465a9dea (EXPERIMENTAL) Memetic Anomaly (#340)
An extensive project, trying to bring this to a functional state.
2016-05-30 23:24:35 +03:00
NanakoAC
4c225f8bd8 Male Unathi can now break cuffs (#346)
Male unathi now have access to the cuff-breaking code
Female unathi do not.

Blame jackboot for this idea.
2016-05-30 23:17:39 +03:00
NanakoAC
2e9e694981 Fixes #347 - Tajaran species equipment correction (#348)
* Tajaran species name
Corrected several errors in the code, which resulted in tajaran gloves
not working properly. 'Tajara' is the singular name of the species
2016-05-30 23:16:03 +03:00
NanakoAC
ee485d5850 Fixes Exosuit passenger removal (#334)
* Fixes Exosuit passenger removal

-Fixed exosuit do_after function, renamed it do_after_mecha
-Fixed all calls to this function
-Removing people from passenger compartments will now work

* Added changelog
2016-05-28 01:55:04 +03:00
skull132
762427f5a2 Merge pull request #329 from Arrow768/feature/Various-Fixes
Feature/various fixes
2016-05-28 01:54:27 +03:00
Werner
a424b71a4b Possible fix for highlander
TS Fix

Law Maker Incendiary Fix

Possible Lawgiver burstfire fix

Lawgiver Changes:
Fix Rapid Fire
Add Armor Piercing
Add Pellets

Lawgiver:
Nerf incendiary bullets

Blow up the users weapon arm if his dna doesnt match
Added a proper soundeffect

Added Changelog.
Closes #71, Closes #327

Make the lawgiver emagable and change stun to a beam

Added crowdcontrol mode to the lawgiver

Final Tweaks to the lawgiver

Updated .gitignore to inclode the .atom-build.json

Fixed indentation
Fixed blowing up the wrong hand if the user switch hands after the killswitch has been triggered
2016-05-27 22:28:55 +02:00
skull132
b1ab52b7b0 Merge pull request #336 from Akrilla/stealth-fix
Stealth suit uncloaks when taking damage or attacking
2016-05-27 21:45:58 +03:00
Akrilla
557bb22e01 Fix. 2016-05-25 20:56:28 +01:00
Akrilla
5215aaf85a Stun baton fix. 2016-05-25 18:47:51 +01:00
Akrilla
23b9b52381 Stealth fixes. 2016-05-25 18:42:52 +01:00
skull132
b552e3743b Merge pull request #330 from NanakoAC/Sterilizine
Fixed Sterilizine not sterilising wounds. Also tweaked spraybottle message visibility
2016-05-24 02:27:29 +03:00
skull132
18f60c476f Merge pull request #328 from NanakoAC/AlliesCocktail
Fixed Allies Cocktail
2016-05-24 01:59:08 +03:00
NanakoAC
a96d655632 Fixed Sterilizine not sterilising wounds. Also tweaked spraybottle message visibility
*Sterilizine will now reduce the germ level of all wounds on the mob on
contact, proportional to the quantity sprayed
*Spraybottles will now display the "<Person> sprays <otherperson> with
the <spraybottle>" message when spraying on any mob
2016-05-22 10:53:04 +01:00
NanakoAC
67b08854e8 Fixed Allies Cocktail
Fixed allies cocktail, it was asking for an incorrect ID for the martini
2016-05-21 17:34:58 +01:00
NanakoAC
cbf5606271 Revert "Fixed Allies Cocktail"
This reverts commit f3b295d13b.
2016-05-21 17:23:44 +01:00
NanakoAC
f3b295d13b Fixed Allies Cocktail
The recipe called for 'classicmartini', rather than 'martini' which is
the correct ID of the drink named Classic Martini.

Changed it to require the proper ID
2016-05-21 17:17:36 +01:00
NanakoAC
6e1c3a6b21 Fixed Painkiller Overdose Hallucinations
Paracetamol overdose now causes hallucination strength 25
Tramadol overdose now causes hallucination strength 40
Oxycodone overdose now causes hallucination strength  60
2016-05-21 09:17:44 +01:00
Akrilla
4b2290fc7e Removing errors, will sort out another time. Can't test locally as my server is dead. 2016-05-19 15:21:40 +01:00
Akrilla
c55a0eef21 Commenting out animation. 2016-05-19 15:17:36 +01:00
Akrilla
465da7779a Last try. 2016-05-19 15:14:43 +01:00
Akrilla
b315b479ad Anim fix. 2016-05-19 15:06:02 +01:00
Akrilla
a0e6c3ac79 Change to usr. 2016-05-19 14:59:09 +01:00
Akrilla
cf4f6ba200 Okay, I actually fixed it this time. 2016-05-19 14:52:45 +01:00
Akrilla
570a0bee07 Bug fix. 2016-05-19 14:47:50 +01:00
Akrilla
0520ea0ebe Taking damage or attacks removes stealth. 2016-05-19 14:43:22 +01:00
skull132
d5129d93c0 Merge pull request #311 from Akrilla/cleanbots-fix
Cleanbots lag fix and code cleanup.
2016-05-19 03:23:43 +03:00
skull132
e08f80f518 Merge pull request #309 from skull132/master
Banning Update + WebInterface Button
2016-05-18 22:18:40 +03:00
skull132
af73877426 Merge pull request #310 from skull132/vampire_rewrite
Vampire rewrite
2016-05-18 22:03:04 +03:00
skull132
d136181f8c Ban Mirroring - Hotfix
Bad prepared statement execution fixed.
2016-05-18 21:57:53 +03:00
skull132
ec0a5fc53c Merge pull request #312 from skull132/antagonist-fixes
Antagonist fixes
2016-05-18 21:50:54 +03:00
skull132
8447395d85 Vampires - Immunity to disease
Vampires are now immune to disease.
2016-05-18 21:50:41 +03:00
Mustafa Kalash
45627709d3 Fixes #12785. Sets next_spawn after the game starts and attempts to autospawn after world.time passes next_spawn. 2016-05-18 21:20:32 +03:00
Akrilla
5c4af8dd7e Compile error fix. 2016-05-18 18:01:26 +01:00
Akrilla
fdcf42ab0a Fix for cleanbot lag, and a quick rewrite of search loop. 2016-05-18 17:45:09 +01:00
skull132
b1af6d4086 Conflict Resolution
# Conflicts:
#	interface/skin.dmf
2016-05-18 17:26:08 +03:00
skull132
79044f3597 Merge pull request #308 from Akrilla/cold-slimes
Slimes take damage when under their cold threshold.
2016-05-18 15:25:33 +03:00