cib cc2aaf1731 Merge branch 'master' of github.com:Baystation12/Baystation12 ...

Conflicts:
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/life.dm

2012-08-06 15:18:27 -07:00

..

admin

Added cyborg to jobbans for security etc.

2012-08-04 12:41:50 +03:00

assembly

TG: Added checks for the player being dead, stunned, unconcious ect... to:

2012-06-14 17:15:58 +01:00

chemical

Merge pull request #1558 from FireFishie/closets

2012-08-01 00:23:05 -07:00

client

Abi's request

2012-06-20 13:05:06 +01:00

clothing

By vote, space proofed captain armor and changed the memo

2012-08-01 03:58:50 -04:00

critters

oops

2012-08-06 00:17:05 +10:00

customitems

reworked id spawning, added some fixes

2012-08-02 14:33:19 +10:00

DetectiveWork

fixes to vermin spawning, replaced rag spawners in map with actual rags

2012-08-03 20:21:43 +10:00

flufftext

Changed all entries of "Nanotrasen" to "NanoTrasen" and corrected the misspelling of "apologize" in the gravity toggle messages.

2012-07-31 01:14:14 -04:00

food

TG: - Added a cookie food type, which cannot be made ingame

2012-06-23 15:49:05 +01:00

icon generation

Adding some (currently unused) icon generation stuff

2012-05-30 17:54:33 -04:00

maps

More while loop stuff, removed shitloads of unnecessary curly brackets in the map reader, fixed ED-209 projectiles

2012-06-22 14:10:48 -07:00

mining

Merging pull request from caelaislinn-master

2012-07-13 20:54:22 +03:00

mob

Merge branch 'master' of github.com:Baystation12/Baystation12

2012-08-06 15:18:27 -07:00

paperwork

TG: Comitting for Giacom.

2012-06-23 16:42:37 +01:00

power

modified lockdown computer and blast doors / shutters on antiqua and exodus, now has increased usability etc.

2012-07-29 03:28:50 +10:00

projectiles

Changed all entries of "Nanotrasen" to "NanoTrasen" and corrected the misspelling of "apologize" in the gravity toggle messages.

2012-07-31 01:14:14 -04:00

recycling

Adds caching to dummy objects, seems to work great.

2012-07-26 17:14:31 -07:00

research

various tweaks to energy fields, energy field artifacts (some outstanding bugs still)

2012-08-06 05:13:02 +10:00

scripting

Changed all entries of "Nanotrasen" to "NanoTrasen" and corrected the misspelling of "apologize" in the gravity toggle messages.

2012-07-31 01:14:14 -04:00

security levels

UltraLight optimizations, and moving of access levels into a defines. (Pre-processor stuff is fun)

2012-06-21 13:35:34 -07:00