Cael_Aislinn c0102cf13e Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	baystation12.dme
	code/defines/procs/global_lists.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/mecha/working/ripley.dm
	code/modules/mob/living/carbon/human/human_attackalien.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/new_player/preferences.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2012-12-29 13:06:03 +10:00

..

decals

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2012-12-29 13:06:03 +10:00

spawners

Removed yet another type of gib that looks like a head.

2012-12-16 04:40:19 +01:00

aliens.dm

-Added WJohnston's new laser-proof armour sprite.

2012-11-03 07:39:10 +00:00

barsign.dm

added random barsigns. will add them to the map when we get closer to merging

2012-09-09 00:39:43 +10:00

biomass_rift.dm

More file structure stuff!

2012-08-26 03:32:58 +00:00

bump_teleporter.dm

- Updated ingame polling to allow for polls that ask for player-entered text. This allows for more complex answers than a pick from a list.

2012-10-07 21:08:23 +00:00

effect_system.dm

internal explosions

2012-11-09 20:24:44 +04:00

gibs.dm

Lots of bugs fixed for advance diseases.

2012-11-13 00:28:07 +00:00

glowshroom.dm

New lighting, it's essentially just the old DAL system with a queue.

2012-08-25 16:06:57 +00:00

landmarks.dm

Commiting for Aranclanos

2012-10-07 22:18:29 +00:00

manifest.dm

Map and Animal fixes!

2012-08-29 22:59:53 +00:00

mines.dm

Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it.

2012-11-11 14:33:33 -07:00

misc.dm

More file structuring.

2012-09-05 22:44:48 +00:00

overlays.dm

Fixed palm trees. You can no longer shove them around, and you'll no longer appear standing over the top half of them.

2012-10-17 05:12:39 +00:00

portals.dm

File restructuring!

2012-08-29 18:00:30 +00:00

signs.dm

antiqua fixes: tvalve, barsigns, doctor's wardrobe, high volume pump, engine areas, moving parts sign, various other areas

2012-12-01 17:49:34 +10:00

step_triggers.dm

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

2012-09-22 21:29:04 +10:00