Commit Graph

1717 Commits

Author SHA1 Message Date
Chinsky
95ff9570ee Merge pull request #7930 from RKF45/newpaint
Generic paint
2015-02-03 18:15:42 +03:00
Chinsky
74df9669a0 Merge pull request #7719 from Zuhayr/species_tweaks
Species tweaks.
2015-02-03 18:11:18 +03:00
PsiOmega
a57cd8c380 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-02-03 14:51:54 +01:00
RKF45
6577cd2a55 Merge remote-tracking branch 'upstream/dev' into newpaint
Conflicts:
	code/game/objects/items/weapons/paint.dm
2015-02-01 23:04:18 +01:00
RKF45
4d8dd50cea Mixing of paint
The generic paint can now be mixed and tranferred.
2015-02-01 22:54:18 +01:00
volas
ea8e848463 copytext() check for some input 2015-02-01 23:16:04 +03:00
PsiOmega
6fabf503e1 Merge remote-tracking branch 'upstream/master' into dev 2015-02-01 17:39:19 +01:00
RKF45
4eb3e16f72 Reviewing paint recipes
All recipes make "paint" and have different colours via var/resultcolor
White paint can also be made non-ghettoly.
2015-02-01 01:34:39 +01:00
GinjaNinja32
1b08463b7e Antibodies rework. 2015-01-26 05:32:00 +00:00
RKF45
7baeab055f Paint recipes 2015-01-25 18:04:45 +01:00
RKF45
137b6a99a9 You have to be kidding me 2015-01-25 03:22:01 +01:00
RKF45
b1c74fc9db Grinding crayons 2015-01-25 03:12:52 +01:00
Kelenius
10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
Zuhayr
8756bb99bd Adds species-specific comfort tweaks, skrell nutrition changes. 2015-01-20 19:12:35 +10:30
Kelenius
5f496524d2 Changes how sprays work and re-adds silicate
Sprays will spray directly at solid objects if they are clicked (walls,
windows, etc).
Makes removal of wall rot with plant-b-gone actually work.
Re-adds silicate with the old recipe. It repairs windows and makes them
more damage-resistant up to half damage taken.
2015-01-17 19:11:41 +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
Chinsky
95e4f53258 Ported TG's code for burny mobs, by ergoslavi. 2015-01-15 23:47:07 +03:00
Zuhayr
61d35bd474 Merge resolution. 2015-01-12 07:17:02 +10:30
Loganbacca
441ee30bfb Fixes multiplying grape soda
Also cleaned up some indenting
2015-01-11 19:14:59 +13:00
Kelenius
966ba79a28 Update for the slimes
Water damage relative to water amount
Better interface for player-controlled slimes
Feed on simple_animals
Heavy refactoring
Friendly glomps at the slimes of the same color, non-friendly at the
slimes of different color
Fixes #7647
Fixes #7107
Fixes #6812 for the slimes only
2015-01-09 02:44:02 +03:00
Zuhayr
cb88860f6b Merge resolution. 2015-01-07 03:43:12 +10:30
Tramziller
06e6277dc6 Fixed bug of peridaxon healing robotic organs 2015-01-05 22:17:40 +01:00
Kelenius
c1d07cd77b Fixes a tiny typo and a comment
So basically toxins are not processed like all other reagents - instead
that is handled to the liver. Since dionae/dionas have no liver, toxins
would never leave their system. There is a check for aliens to
forcefully call ..(), but due to a typo it was only called if the drug
had any toxpwr. Since mindbreaker (and several others) has toxpwr = 0,
such drugs would never leave a poor diona's... khm, system.

The question to how diona even get affected by those in the first place
stays open.

Fixes #6994.
2015-01-03 23:19:14 +03:00
Zuhayr
505d84049c Properly implements the species insulated var (renames it to siemens_coefficient), includes it in electrocution, rebalances species values accordingly. 2014-12-28 19:16:07 +10:30
Zuhayr
c49cb0c645 Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev-freeze 2014-12-24 22:43:10 +10:30
Zuhayr
591fc164de Updating rack paths to match previous commit. 2014-12-24 12:26:43 +10:30
Zuhayr
cc00fa3d52 Fixes and tweaks to the previous. 2014-12-23 22:03:02 +10:30
Zuhayr
bbfc6db0a3 Refactored gibbing and slipping for carbon mobs, entirely removed mutantrace var. This commit is only partial, following commits are contiguous to it (lol this is atomic right) 2014-12-23 17:38:05 +10:30
mwerezak
c554f70d88 Fixes colour mix up
Somehow phoron got the colour meant for inaprovaline.
2014-12-13 17:54:30 -05:00
PsiOmegaDelta
0bba4e6f68 Merge pull request #7441 from sabiram/dev-freeze
Adds 'me' hotkey again, corrects hotkeys-help, typo fixes.
2014-12-13 14:59:41 +01:00
mwerezak
6aa2c09fcf Replaces dummy reagent colours 2014-12-12 16:06:16 -05:00
sabiram
953f365292 Adds 'me' hotkey again. Pedantic spelling changes. 2014-12-12 15:44:22 -05:00
Zuhayr
bc394b72d6 Fixes diona and simple_animals eating snacks. 2014-12-09 22:14:41 +10:30
PsiOmega
957ff8314d Cargo can now order empty blood packs. 2014-11-30 16:45:52 +01:00
PsiOmega
7386a881d7 Merge remote-tracking branch 'upstream/master' into dev 2014-11-25 10:33:47 +01:00
Zuhayr
a63ec86871 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-11-24 08:58:30 +10:30
GinjaNinja32
fbce3cba4b Fix neaera cubes, change monkeycube eat varfind method to not create nullspace monkeys 2014-11-23 18:57:42 +00:00
Zuhayr
5568ed15c1 Randomizes strange seed icons, fixes poppies. 2014-11-23 10:15:15 +10:30
Zuhayr
2b4cd94650 Merge resolution. 2014-11-19 23:28:09 +10:30
Zuhayr
660b32629e Merge resolution. 2014-11-19 23:19:33 +10:30
Zuhayr
425aaf1cba Merge pull request #7047 from mwerezak/sliceable
Fixes inverted slicing check
2014-11-19 23:13:16 +10:30
mwerezak
3a83a31440 Merge remote-tracking branch 'upstream/dev' into sliceable
Conflicts:
	code/modules/reagents/reagent_containers/food/snacks.dm - caused by whitespace :/
2014-11-16 22:25:50 -05:00
mwerezak
2e222523e1 Fixes inverted slicing check 2014-11-16 22:13:17 -05:00
mwerezak
9eb6dfdef4 Fixes #7026
Uploads species var from human to carbon mobs.
2014-11-16 14:43:38 -05:00
Amunak
4a845beb7d corrects volume shown in description of beakers 2014-11-16 20:33:25 +01:00
Zuhayr
4d64a11acd Manual merge of head.dmi. 2014-11-14 23:02:16 +10:30
Zuhayr
ebbb9b36b5 Moved everything to a module-based hardsuit system.
Generalized all ninja power and gear code to work with new rig system.
Added shurikens, weapon mount, more work on deployable items.
Readded energy nets and energy blades.
Grenade launcher/charge stuff, interface stuff.
Renamed previously existing rigs to voidsuits, restructured rig and voidsuit files.
Refactored the energy net and teleportation proc.
Totally rewrote AI core/intellicard transfer procs.
Added rig sprites by Mordeth221, added step by steap suit sealing/inability to interfere with suit sealing process.
Updated map paths to use voidsuits.
Added chemical dispenser functionality, added power sink, added atom/drain_power() proc for later use.
Added rigsuit verbs, added voice changer.
Renamed MASKINTERNALS to AIRTIGHT, added internals checks for airtight helmets.
Added drain_power() procs to vulnerable machinery.
Reimplemented data theft.
Added suit maluses for losing your cell while wearing one.
Transitioned the rig suits to a back-mounted item that also controls a chestpiece.
Converted rig module to a storage item, convert ERT voidsuits to hardsuits.
2014-11-14 22:57:26 +10:30
Chinsky
43ee395c48 Merge pull request #7013 from Raptor1628/dev
ERT Update
2014-11-14 11:18:50 +03:00
Zuhayr
31b6cc19ad Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything. 2014-11-13 21:41:02 +10:30
Zuhayr
90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30