Commit Graph

744 Commits

Author SHA1 Message Date
PsiOmega
f8c5cf8f83 Adds a kit with cigarette packs and zippo lighter.
Includes 2 packs of flash powder cigarettes, 2 packs of smoke creating cigarettes, 1 pack of mindbreaker cigarettes, and 1 pack of tricordrazine cigarettes.
2015-02-12 16:35:49 +01:00
PsiOmega
73bc5934d5 Replaces uplink Donk-pockets with Sin-Pockets.
Sin-Pockets can be self-heated using the future magic of producing heat by mixing chemicals.
Each heated pocket contains: Doctor's Delight - 5 units, Hyperzine - 5 units, Synaptizine - 1 unit.
Overconsumption is definitely possible by the careless.

Makes the concealed cane use non-del methods.
2015-02-11 09:55:50 +01:00
PsiOmega
d0a59bcd03 Adds a health section in the uplink.
Box of donk-pockets for 1 TC.
Combat medical kit, containing bicardine, dermaline, dexalin plus, dylovene, tramadol, and spaceacillin, for 5 TC.
2015-02-10 21:29:29 +01:00
PsiOmegaDelta
973bc1c0f3 Merge pull request #8071 from RKF45/newpaint
Generic Paint II: Fun with Paint
2015-02-10 06:48:32 +01:00
RKF45
13f09d95c8 Juice paints 2015-02-08 01:17:10 +01:00
RKF45
db6ff13f5f No painting ghosts!
Holograms can be coloured, though
2015-02-07 23:59:34 +01:00
Ccomp5950
8f2720b179 Merge pull request #8052 from mwerezak/boolit
New bullet types, projectile refactor
2015-02-07 14:07:22 -05:00
Ccomp5950
33e2fae704 Merge pull request #7967 from Kelenius/ofSlimesAndHumans
Update for the slimes
2015-02-07 00:20:13 -05:00
mwerezak
0b8940da79 Merge remote-tracking branch 'upstream/dev' into boolit 2015-02-06 20:23:05 -05:00
unknown
39b467c9da New bullet types, projectile rewrite
* Refactors projectile Bump()
* Converts projectile_type var strings to paths
* Reorganizes bullet projectile paths
* Made a pass through all the bullet_act() definitions. Mainly ensured that damage_type is checked when dealing damage to certain objects. Removed stupid /turf bullet_act() override, replaced with on_hit() overrides on the relevant projectiles.

* Adds shotgun pellets projectile. Adds Raptor's shotgun slug sprite.
* Gives stunshots more of their own identity, refluffs them as taser cartridges for shotguns. They still aren't obtainable anywhere unless spawned.
* Makes projectiles pass through girders and cultgirders with a certain probability, unless the girder itself was clicked.
* Projectiles are also able to pass through grilles. Low damage projectiles have a chance to be blocked by grilles. High damage projectiles have a chance to have some damage absorbed by the grille.
* Makes projectiles for blanks invisible.
* Adds flash bullet types
* Adds support for 'penetrating' projectiles
* Swaps .45 and 9mm projectile types. .45s hit slightly harder, 9mils have more ammo capacity.
2015-02-06 20:09:32 -05:00
RKF45
5fc1ae395d All cleaning removes paint
Paint works on mobs and objects
2015-02-07 01:41:08 +01:00
RKF45
0ad5195af2 Cleaning up 2015-02-06 23:55:11 +01:00
Chinsky
3384f13a31 Merge pull request #8029 from GinjaNinja32/viro
Virology rework
2015-02-06 00:18:13 +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
Chinsky
f8b94456ba Merge pull request #7844 from Kelenius/ofDryingAndRacks
Adds drying racks, tobacco, and updates pipes
2015-02-04 18:15:13 +03:00
Chinsky
82ca870c53 Merge pull request #8028 from GinjaNinja32/beaker
Change beakers, bottles, syringes and vials to use /image and multiplicative blending
2015-02-04 18:14:22 +03:00
Kelenius
c9824f62df Conflict fix 2015-02-03 23:29:08 +03: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
GinjaNinja32
37f47fd3fa Merge remote-tracking branch 'upstream/dev' into viro 2015-02-03 16:28:10 +00:00
GinjaNinja32
c4788ad6f5 Merge remote-tracking branch 'upstream/dev' into viro
Conflicts:
	code/modules/virus2/disease2.dm
2015-02-03 15:33:37 +00:00
Chinsky
84472462ab Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into firefirEFIREBURNAHAHAHA
Conflicts:
	code/modules/mob/living/living_defines.dm
2015-02-03 18:30:18 +03:00
GinjaNinja32
fa75cb9fab Change beakers, bottles, syringes and vials to use /image and multiplicative blending 2015-02-03 15:23:48 +00:00
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