mwerezak
ab6f0bf30c
Merge remote-tracking branch 'upstream/dev' into gun-rewrite
...
Conflicts:
code/modules/clothing/under/ties.dm
code/modules/projectiles/projectile.dm
2015-02-10 20:59:22 -05:00
mwerezak
bf24ac82b8
Removes IsHandgun() proc, adds slot flag
2015-02-10 20:25:41 -05: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
Zuhayr
402987edc3
Merge with dev.
2015-02-07 14:44:55 +10:30
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
Zuhayr
c5e2feb5f1
Merge with dev.
2015-02-05 20:24:06 +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
Zuhayr
fdf0360a69
Collapsing all fruit into one object type. Refactoring reagent grinder and removing juicer. WIP.
2015-02-04 10:55:33 +10:30
Zuhayr
09e4be2b1b
Collapsed space vines, glowshrooms and biomass into one spreading-plant system.
2015-02-04 10:49:41 +10:30
Zuhayr
0e93c1cf7b
Rewriting the /obj/effect/glowshroom into a more general system.
2015-02-04 10:49:09 +10:30
Zuhayr
d616040e8c
Renamed some files, did some path replacements
2015-02-04 10:48:18 +10:30
Zuhayr
3ff956da69
Moved grown.dm to hydro folder for traits.
2015-02-04 10:46:24 +10:30
Zuhayr
d08861e25b
Moved gas/light/pressure from hydro tray to seed datum
2015-02-04 10:46:10 +10:30
Zuhayr
983ca55c9d
Autopopulates the plant and product icon lists at roundstart. Should make missing plant icons obnoxiously easy to spot due to a world output in bright red.
2015-02-04 10:43:33 +10:30
Zuhayr
e5935e01f1
Span classes.
2015-02-04 10:43:01 +10:30
Zuhayr
78e61d9ccd
Tweaks to xenoflora, added plant icons and colours to all plants.
2015-02-04 10:42:39 +10:30
Zuhayr
5538ce5589
Refactored nettles and sunflowers into regular plants.
2015-02-04 10:38:56 +10:30
Zuhayr
7bc70f46b0
Tweaks/fixes for fruit effects.
2015-02-04 10:37:54 +10:30
Zuhayr
4791ef2b74
First pass on xenoflora expansion.
2015-02-04 10:37:37 +10:30
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
