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

Conflicts:
	baystation12.dme
	code/modules/events/event_manager.dm
	code/modules/events/ion_storm.dm

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

2013-02-11 02:56:07 +10:00

..

admin

added global PM visibility for mods

2013-02-11 02:51:55 +10:00

assembly

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

awaymissions

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

client

restructured/cleaned up how admin-pms are sent (retained original code just in case), made it so that only holders with R_ADMIN can see private messages, added a timeout warning to anyone PMing a player so they dont get spammed (default to 5 seconds, config edited)

2013-02-10 21:29:02 +10:00

clothing

I am tired of doing this

2013-02-08 17:46:05 -05:00

customitems

Added Purple Gloves

2013-01-15 17:44:23 -05:00

destilery

- Added a config option that requires players to have played a certain number of days to select some jobs to play. The option is turned off by default and requires the database to work. See screenshot for default age requirement.

2013-01-15 03:39:46 +00:00

detectivework

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

2013-01-14 21:07:16 +10:00

DetectiveWork

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

events

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

2013-02-11 02:56:07 +10:00

flufftext

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

food

removed a bunch of unused files, moved amorphs and meme to workinprogress/cib

2013-01-15 23:29:49 +10:00

genetics

Replaced monkey with confusion effect.

2012-11-11 19:35:01 +01:00

icon generation

…

library

Committing a fix for recursive books

2012-11-15 20:30:36 +00:00

liquid

…

maps

…

mining

observers can become mice, strange ore can be picked up in ore boxes/satchels, crates and closets can be built out of plasteel, changelog update

2013-01-21 18:47:03 +10:00

mob

unique voice text colour for soghun, skrell and taj

2013-02-10 22:36:23 +10:00

paperwork

Merge branch 'incremental_tg' r5600 into bs12_with_tgport

2013-01-23 00:23:37 +10:00

power

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

projectiles

Due to git tree being fucked up for some reason, manually reapplied many man many fixes.

2013-02-07 07:13:27 +04:00

reagents

players can choose the bottle icon of new pill bottles, forgot to save map

2013-02-10 21:55:40 +10:00

recycling

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

research

mice no longer have universal speak, carp and giant spiders will no longer carve through the station, removed unused item

2013-02-09 01:13:30 +10:00

scripting

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

security levels

Updated the map with fixed incinerator doors that use the new heat_proof var.

2012-12-16 20:52:29 +00:00

surgery

Readded limb cutoff surgery.

2013-02-09 22:43:39 +04:00