Commit Graph

111 Commits

Author SHA1 Message Date
Mike e76f431687 Adjusted fuel spread
Made fuel stickier, so it spreads less thinly.
2014-04-17 21:19:05 -04:00
Ravensdale a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07: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
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
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
Zuhayr 2e0ff4cd87 Converting existing objects over to /vg/station blood setup. 2013-12-26 01:46:39 +10:30
Chinsky 716a901858 Made ash dirty floors 2013-12-25 15:10:10 +03:00
Chinsky 0b670f611d Makes ash disappear on attack_hand to solve issue where paper burned inside containers would create immovable pile of ash.
I could swear that's how ash behaved at some point, but then again, I am drunk
2013-12-25 00:58:20 +04:00
Chinsky ac1c24f35c Adds ability to write on floors and walls with blood.
Codersprites for now.
2013-12-25 00:11:50 +04:00
Chinsky e3e569593d Fixed dried blood showin up as 'dried the blood' 2013-12-24 18:47:06 +03:00
Chinsky 4cb94fbf50 Small pefomance boost for drying blood.
Now using colors instead of icon procs.
2013-12-24 09:33:00 +03:00
Mloc-Argent a084f74c7d Expansion of every "icon = ''" path.
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-09-01 21:53:36 +01:00
Mloc-Argent adc3c14779 Revert #3316 from BEF due to compile errors and (assumed) missing files.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-20 18:38:00 +01:00
LordBraindead 08d2e22220 fire update
enabled fire to destroy floors and objects
also tweaked the behaviour of glass to enable glasslocks against fire
also made fire extingiushers stop being useless
2013-07-14 21:20:45 +02:00
Chinsky 960a22ee43 Changes way viruses are stored in mobs.
Now it's an associative list:
uniqueID - virus datum

Updated most instances to match it.
2013-06-19 02:28:53 +04:00
Chinsky 7a8a822a92 Made it possible for mob to be infected with several viruses at once. 2013-06-09 13:31:16 +04:00
Chinsky 3bbb250749 Added bloody footprints. 2013-06-01 14:30:05 +04:00
Chinsky 0b9c904252 DRY BLOOD FOR THE BLOOD GOD.
Blood will now dry up in around half an hour.

Also moved blood drip define out of disposals. WTF.
2013-06-01 10:56:59 +04:00
SkyMarshal 710e97bcc6 fuel is now a bit less derpy. Napalm produces volatile fuel, and less of it. Fire consumes more welding fuel. 2013-04-18 09:56:52 -07:00
Cael_Aislinn 1c9b04ec74 copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-14 21:07:16 +10:00
Cael_Aislinn bdeb96b7e5 Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/__HELPERS/game.dm
	code/controllers/shuttle_controller.dm
	code/datums/datumvars.dm
	code/datums/supplypacks.dm
	code/defines/obj/storage.dm
	code/defines/obj/vending.dm
	code/defines/obj/weapon.dm
	code/defines/procs/command_alert.dm
	code/game/area/Space Station 13 areas.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/dust.dm
	code/game/gamemodes/events/miniblob.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/factions.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/jobs/access.dm
	code/game/jobs/job/assistant.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/engineering.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/alarm.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/message.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/constructable_frame.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/recharger.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/working/ripley.dm
	code/game/objects/items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/medical.dm
	code/game/objects/items/weapons/cards_ids.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/hydroponics.dm
	code/game/objects/items/weapons/manuals.dm
	code/game/objects/items/weapons/secstorage/secstorage.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/storage/firstaid.dm
	code/game/objects/items/weapons/storage/kit.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
	code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/electricchair.dm
	code/game/objects/structures/extinguisher.dm
	code/game/objects/structures/watercloset.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/game/vehicles/airtight/airtight.dm
	code/game/vehicles/vehicle.dm
	code/global.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/critters/critter_defenses.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/power/cable.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/revolver.dm
	code/modules/projectiles/projectile/change.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/recycling/sortingmachinery.dm
	code/modules/research/designs.dm
	config/config.txt
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	icons/obj/grenade.dmi
	icons/obj/projectiles.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-11 22:12:31 +10:00