Commit Graph

68 Commits

Author SHA1 Message Date
Zuhayr
a8089d4437 Merge master into dev. 2015-02-12 23:01:08 +10:30
mwerezak
5b5e16916f Replaces text expressions with macros 2015-02-12 01:55:12 -05:00
mwerezak
28f3bf739d Fixes randomized seed nutrient_consumption
Centers the range of possible values evenly between small amount and
heavy supply.
2015-02-11 23:06:29 -05:00
Kelenius
e6dc9d36fd Update for machine upgrades and some science
Also adds RPED and makes biogenerator and borg charger constructible .
2015-02-08 15:39:11 +03:00
Zuhayr
43d576dcc5 Merge pull request #8054 from mwerezak/chembottles
Replaces chem bottles with their overlay equivalents
2015-02-05 23:05:45 +10:30
mwerezak
9caf76d069 Glass bottles are now dispensed with the lid on
It seemed kind of silly that vendors, for example, would dispense
bottles with their lids off.
2015-02-05 00:41:59 -05:00
mwerezak
8da0fb7f43 Merge remote-tracking branch 'upstream/dev' into chembottles
Conflicts:
	code/modules/hydroponics/hydro_tools.dm - flags var
2015-02-05 00:37:19 -05:00
mwerezak
59bbf3a883 Replaces chem bottles with their overlay equivalents 2015-02-05 00:31:56 -05:00
Kelenius
9edb5751fb Adds tobacco and maps in drying racks 2015-02-03 22:24:49 +03:00
Kelenius
536388978f Conflict fix 2015-02-03 20:57:16 +03:00
Kelenius
0e7ed6aef4 Merge branch 'dev' into ofDryingAndRacks 2015-02-03 20:51:27 +03:00
Chinsky
aa7fde250c Merge pull request #7801 from Mloc/bs12-glowypipes
refactor buckling + glowy HE pipes
2015-02-03 18:12:09 +03:00
Chinsky
fb929a9688 Merge pull request #7796 from Kelenius/ofVendorsAndSeeds
Replaces seed vendors with seed storages
2015-02-03 18:10:57 +03:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
GinjaNinja32
b43e0ed95b Fixes vine runtime 2015-01-21 20:39:55 +00:00
GinjaNinja32
0edcf0c349 Fixes a warning in reagent code caused by mistyped reagent ids 2015-01-21 20:34:04 +00:00
Kelenius
746e1acf8d Added variety (uid) field to seed vendors 2015-01-17 20:52:06 +03:00
Kelenius
6f7a7177f2 Adds drying racks and updates pipes
You can now dry plants using a special machine, and you can now stuff
those plants into pipes to smoke then. It slowly transfers the reagents
from the plant into the smoker.
2015-01-16 02:57:59 +03:00
Mloc-Argent
537b78fc80 refactor buckling to be more generic
Buckling procs and vars have been moved down to /obj.
Behaviour is mostly the same, but you can buckle cuffed people to
 pipes and they will automatically unbuckle if the cuffs are removed.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2015-01-12 21:28:31 +00:00
Kelenius
31768af22f Removes the now useless New() 2015-01-12 09:43:18 +03:00
Kelenius
d66857757a Replaces seed vendors with seed storages 2015-01-12 09:36:04 +03:00
Zuhayr
982998d08d Fixes #7636 2015-01-03 06:53:29 +10:30
Zuhayr
014729a001 Addendum to previous commits. 2015-01-03 05:52:29 +10:30
Zuhayr
a34a1f66cf Fixes #7632 2015-01-03 05:23:44 +10:30
Zuhayr
591fc164de Updating rack paths to match previous commit. 2014-12-24 12:26:43 +10:30
SparklySheep
dfbe05ff8b Fixes a typo in the Hydroponics reagents 2014-12-13 14:59:56 -06:00
Zuhayr
c569d52700 Fixes pretzels being unmakable (use a poppy instead of the seeds) 2014-12-13 22:46:55 +10:30
Zuhayr
ff2c23714f Bunch of diona nymph tweaks/fixes. 2014-12-09 20:52:41 +10:30
Zuhayr
3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
Zuhayr
a7d526f8b1 Fixes #7119 2014-12-08 03:51:21 +10:30
Zuhayr
a7ce13f49d Fixes #7223 and #6966, adds inhand and suit sprites for nymphs. 2014-12-07 20:44:11 +10:30
Zuhayr
a63ec86871 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-11-24 08:58:30 +10:30
Zuhayr
66c6c0f270 Amendment to the previous. 2014-11-23 10:15:31 +10:30
Zuhayr
5568ed15c1 Randomizes strange seed icons, fixes poppies. 2014-11-23 10:15:15 +10:30
Zuhayr
90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
Zuhayr
40e3ea33f6 Merge resolution. 2014-11-13 16:07:16 +10:30
Zuhayr
b4ea25d064 Merge conflict resolution. 2014-11-10 13:00:06 +10:30
runedog48
457e398dac Fixes #6957 2014-11-08 18:11:35 -05:00
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
PsiOmega
55e44e1523 Fixes #6868
See https://github.com/Baystation12/Baystation12/issues/6868#issuecomment-60784011
2014-10-28 18:05:04 +01:00
Zuhayr
e4ff1a3088 Hydro tweaks, fixes #6808 2014-10-21 09:10:23 +10:30
Zuhayr
ca13d1d5d8 Fixes chem splicing, bioluminescence and seed packets for xenobotany. 2014-10-15 10:05:50 +10:30
Zuhayr
223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Zuhayr
b78e2b0c79 Fixes #6297 2014-09-25 21:49:20 +09:30
Zuhayr
6bdf515ef3 Makes species mutation a bit easier. 2014-09-25 18:48:29 +09:30
Zuhayr
7682711442 Fixes #6474 2014-09-25 18:45:27 +09:30
Zuhayr
4bedceca78 Hydro tweaks. 2014-09-18 21:45:12 +09:30
Zuhayr
afde93e94d Adds random seeds to Cargo for Xenobotany. 2014-09-18 16:39:44 +09:30
Zuhayr
c83c6b652e Compiile fix. 2014-09-17 00:51:20 +09:30
Zuhayr
46f361e907 Several tweaks/fixes for newhydro. 2014-09-17 00:43:33 +09:30