RKF45
1cfd0c3342
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into moreposters
...
Conflicts:
code/game/objects/effects/decals/posters/bs12.dm
icons/obj/contraband.dmi
2014-04-19 19:24:45 +02:00
Chinsky
8777c8c071
Merge pull request #4765 from Jarcolr/devupdate
...
New posters and sprites
2014-04-19 21:10:51 +04:00
RKF45
2c839d4c09
Second and final batch
2014-04-18 21:28:27 +02:00
RKF45
56689c887d
First load of posters
2014-04-18 20:31:27 +02:00
Mike
e76f431687
Adjusted fuel spread
...
Made fuel stickier, so it spreads less thinly.
2014-04-17 21:19:05 -04:00
Jarcolr
4bb17b8686
Let there be space
...
woo
2014-04-17 23:53:27 +03:00
Jarcolr
1e9e50b467
Space and space
...
Woop.
2014-04-17 15:39:44 +03:00
Jarcolr
b33b71649d
New posters - Nienhaus
...
These are new posters for more postery goodness. Credits for the sprites
go to Nienhaus.
For the sprites of the poster go to http://puu.sh/5QlUx.dmi
2 posters are not included: 6th and 7th due to reasons.
2014-04-17 15:24:11 +03:00
Ravensdale
a3e4a43536
Changes most viable, used entries of plasma with phoron.
2014-04-10 05:05:04 -07:00
Jarcolr
b33e9d0b92
Fixes #4621
...
Shogun forgotten in time.
2014-04-01 17:36:36 +03:00
Ccomp5950
942ce6ebc7
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
2014-02-11 18:07:19 -06:00
Segrain
8e11dabf96
Bloody feet.
2014-02-09 13:30:28 +03:00
Segrain
b4a8c370ba
Colouring before updating.
2014-02-09 13:21:18 +03:00
Segrain
be61c65edd
Proper indentation.
2014-02-09 13:12:49 +03:00
RKF45
30f2d49f01
Quotes inside strings confuse and scare me.
2014-01-15 22:45:10 +01:00
RKF45
5083e1cd47
Requested adjustments
2014-01-13 22:54:47 +01:00
Rob Nelson
56e4b11ec5
Dynamic loading of posters
...
* Add dynamic loading of poster designs (untick group in DM to remove, no more toggles)
* Fixes wirecutters duping posters
* Fixes dropped posters not being placeable.
2014-01-11 18:10:31 -08:00
Rob Nelson
2e903710b0
Merge branch 'paint' of https://github.com/RKF45/Baystation12 into paint
2014-01-11 17:58:28 -08:00
RKF45
9e0391af04
Adds Baystation 12-specific posters
2014-01-12 01:42:41 +01:00
Mloc-Argent
dfe18845be
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-01-09 17:42:30 +00:00
Mloc-Argent
c337e5e5f3
More elegant solution to dirt getting in the way.
...
Who needs to click dirt anyway?
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-01-08 21:34:15 +00:00
Zuhayr
1faf2ef25b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-01-08 09:42:47 +10:30
Ccomp5950
c8beb39944
Dirt Fixes. Pass ALL the attack_by's to the floor.
2014-01-05 19:17:26 -06:00
Zuhayr
2c492d8289
Using DNA2 files from master.
2014-01-03 11:19:40 +10:30
Chinsky
2cf4a9279c
Merge pull request #4157 from Ccomp5950/cleanbot_fix
...
Bugfix: Actually implement cleanbot targeting.
2013-12-31 17:33:14 -08:00
Ccomp5950
645710cb0b
Bugfix: Actually implement cleanbot targeting.
...
Cleanbots won't attempt to clean up the same mess.
Also buffed how quickly they clean up dirt from 5 seconds to 2 seconds.
It was creating a blank list and then checking that list to see if anything else had
that mess targeted. Removed the blank list check and added an actual check.
2013-12-30 21:59:20 -06:00
Zuhayr
25f7db1949
Fix for unremovable dirty tiles.
2013-12-31 11:32:36 +10:30
Zuhayr
df6bd5d6c8
Gib rewrite/resprite to allow for arbitrary blood and flesh colours.
2013-12-30 21:48:34 +10:30
Zuhayr
154717aef6
Actually stopped gibs from being shaded without making their footprints pale.
2013-12-29 04:06:17 +10:30
Zuhayr
bf820a99b6
Fixed robot gib display issue, updated single path on map to new path.
2013-12-29 03:07:20 +10:30
Zuhayr
5313851da9
Converted robots over to current blood system/paths, updated various files to work with update.
2013-12-29 02:48:20 +10:30
Zuhayr
5d902525cf
Fixed up human and xeno blood procs, stopped gibs being shaded until we can rewrite them to work with blood colour.
2013-12-29 02:47:46 +10:30
Zuhayr
73a5efec2a
Fixed a gib display issue with robots.
2013-12-29 02:32:10 +10:30
Zuhayr
ca47918e4b
Actually fixed the blood writing runtime this time.
2013-12-29 01:12:47 +10:30
Zuhayr
a17b37ec95
Runtime fix for blood lettering decal.
2013-12-29 00:12:53 +10:30
Zuhayr
01dd4373d0
Minor bugfix with blood painting code.
2013-12-29 00:11:21 +10:30
Zuhayr
c6c1a575d6
Merge of blood file, ammo icons, map. Manual binary file merge incoming.
2013-12-28 23:13:04 +10:30
Zuhayr
661593718f
Using dev-freeze map.
2013-12-27 10:42:13 +10:30
Chinsky
d920a4651f
Fixed rainblowd
2013-12-26 18:16:29 +04:00
Chinsky
a097c235ed
Made tracks use colors instead of icon procs too.
2013-12-26 18:12:01 +04:00
Chinsky
38a8b58ec8
Replaced weird ass space indenetation with tabs in tracks.dm
2013-12-26 16:27:09 +04:00
Chinsky
ff89532402
Sets right color for shoes overlay when stepping in blood.
2013-12-26 16:21:17 +04:00
Chinsky
57178dd251
Derp, forgot to change back from debug icon file
2013-12-26 15:36:25 +04:00
Chinsky
a4e2756134
Made blood coloring use color var instead of icon operations.
...
Updated icons to match (they need to be white instead of black to work)
Updated some colors to look fine on them.
2013-12-26 14:07:18 +04:00
Chinsky
9d9d6de78d
Stopped robot chunks from drying up like meat ones. It's weird, and makes them pitch black.
2013-12-26 13:27:36 +04:00
Zuhayr
e89fe94af8
Merged binary files, adapted chinsky's blood painting procs to function with arbitrary colours.
2013-12-26 14:48:05 +10:30
Zuhayr
d97180239b
Using chinsky's blood file.
2013-12-26 13:46:12 +10:30
Zuhayr
d9a0f496c0
Removed debug strings/values.
2013-12-26 10:35:45 +10:30
Zuhayr
5b6ec6cd12
Added arbitrarily coloured blood decals.
2013-12-26 10:29:42 +10:30
Zuhayr
6b2bfbc38d
Species-based blood colour support code.
2013-12-26 03:21:46 +10:30
