Commit Graph

326 Commits

Author SHA1 Message Date
Chinsky 81a9f87ad7 Merge pull request #8336 from mwerezak/liquidfire
Implements liquid fuel fires
2015-03-03 10:31:49 +03:00
mwerezak 49b3db964f Implements fuel fires
Implements liquid fuel fires using the liquid fuel cleanable decal objects.
Rewrites zburn to be more sane, replaces convoluted calculations with straightforward reaction limit.
Fixes issue with liquid fuel spreading caused by thee object being deleted.
Prevents zones from being repeatedly added to the active fire zones list, and processed repeatedly.
2015-03-02 12:40:01 -05:00
Zuhayr 2139884244 Dev merge. 2015-02-21 19:49:47 +10:30
mwerezak 57ffdc82f6 Replaces stool structures with stool items 2015-02-18 01:06:00 -05:00
Zuhayr 5890fa3c4b Added plant controller. 2015-02-05 15:53:20 +10:30
Zuhayr 09e4be2b1b Collapsed space vines, glowshrooms and biomass into one spreading-plant system. 2015-02-04 10:49:41 +10:30
Zuhayr c789f58b3c Converted seed genetics over to a macro-based list of traits 2015-02-04 10:47:24 +10:30
Zuhayr 26fe1a11a4 Adds exploding fruits. 2015-02-04 10:39:14 +10:30
Zuhayr 8ec096581c Fix for blood drip overlaying + secret feature 2015-01-15 20:10:32 +10:30
Zuhayr 61d35bd474 Merge resolution. 2015-01-12 07:17:02 +10:30
Loganbacca 527e83a4e3 Blood/oil stain fixes
- Fixed item descriptions calling oil-stained items "bloody"
- Fixed mob examine describing oil-stained bare hands and feet as "bloody"
- Fixed blood overlays on shoes not updating after walking through different colored blood
- Removed some colons
2015-01-12 01:08:28 +13:00
Kelenius 080dfc7850 Removes duplicated code from blood decals 2015-01-04 00:59:33 +03:00
Kelenius 1ac8beb18d Makes floorbots clean footprints, makes footprints dry out
Fixes #5944
2015-01-04 00:20:00 +03:00
mwerezak 6eceb15fe6 Merge remote-tracking branch 'upstream/dev-freeze' into poster
Conflicts:
	code/game/turfs/simulated/walls.dm
2015-01-01 15:46:23 -05:00
mwerezak 9485c6410c Fixes #7598 2015-01-01 15:43:28 -05:00
PsiOmega 1047a75da4 Makes remains movable/cleanable.
It's now possible to move remains around.
Non-robotic remains can be poked to turn them into ashes. The ash can then be cleaned up.
2014-12-12 11:52:30 +01:00
mwerezak f9564cbe5e Poster fixes
Fixes #7261
Fixes placed posters being visible on both sides of the wall.
Fixes the poster_type var used to specify certain poster designs on the
map not working correctly, and makes the nuke op shuttle poster an
actual poster.
Poster placement now belongs to the poster object instead of turf/simulated/
Posters can now be placed on unsimulated and shuttle walls.
2014-12-07 22:30:08 -05:00
mwerezak 5b1f7695e3 Remaps the nuke ops shuttle for station docking
Adjusts the shuttle to incorporate a nice, 2-tile wide docking hatch.
Drops the viro/xenobio docking arm.
Adds a button so that the teleporter blast door can be operated
independently of the airlock blast door.
Fixes some leftover arrivals area just hanging around in space.
Adds a poster specifically for the nuke ops shuttle.
2014-12-05 01:17:17 -05:00
Mloc-Argent 117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
PsiOmega bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
Zuhayr 99ff852e46 Removes references to the Syndicate and renames nuclear emergency mode. 2014-10-19 16:05:40 +10:30
Zuhayr b47d91b612 Merge resolution, master into dev. 2014-08-21 12:01:38 +09:30
Whitellama da93b893ce Fixed silly typo. 2014-08-17 03:03:17 -07:00
Whitellama 4bfd59c8d7 Renamed an argument to h ave clearer meaning. 2014-08-17 02:54:35 -07:00
Whitellama f1494c9b76 Admins now get logs when welding fuel is spilled on the floor, and welding tanks gain fingerprints when someone gets fuel from them. 2014-08-17 02:48:08 -07:00
Mloc-Argent d5e9851b62 integrate XGM into the code
New turf proc: assume_gas().  Maps to air.adjust_gas_temp().
Lots of optimizations to processing, fire, lighting, HasEntered() and
 more.
Zones now process all fire data and existance in one go, fire objects
 only handle spreading.
Most code has been ported straight so some of it mightn't be ideally
 structured for the new gas_mixtures.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-22 19:52:12 +01:00
Hubblenaut c0ae74b813 Fixes non-existant feet getting bloodied and adds blood to wheelchairs 2014-07-02 22:34:50 +02:00
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