HugoLuman 18aaaa9366 Resolves conflict in interface/stylesheet.dm ...

The new stylecolor for Abductors used the same line as the Drask's

Signed-off-by: HugoLuman <qaggeler@uci.edu>

2016-04-20 14:44:24 -07:00

..

admin

last fixes

2016-04-19 01:34:54 -04:00

alarm

…

arcade

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

assembly

Fixes Anomalies Not Neutralizing

2016-04-15 00:12:42 -04:00

atmos_automation

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

awaymissions

Updates maploader code to be in line with tg's, startup improvements

2016-04-10 02:57:58 -04:00

client

Resolves conflict in interface/stylesheet.dm

2016-04-20 14:44:24 -07:00

clothing

Resolves conflict in interface/stylesheet.dm

2016-04-20 14:44:24 -07:00

computer3

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

crafting

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

customitems

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

detective_work

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

economy

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

events

fixes

2016-04-18 22:53:31 -04:00

examine

…

ext_scripts

…

fish

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

flufftext

Fix remaining issues and sound shit

2016-04-05 16:26:11 -07:00

food

Ports SNPCs

2016-04-09 00:10:01 -04:00

garbage_collection

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

holiday

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

hydroponics

Refactors hostile mob code, unsnowflakes bears, panthers, and snakes

2016-04-14 20:36:45 -04:00

karma

Adds the rest of the karma code

2016-04-14 16:12:46 -07:00

library

Fixes books being blank

2016-04-16 19:12:58 -04:00

lighting

…

logic

Fix all of the merge conflicts and lacking to_chats with 4041

2016-04-05 21:16:52 -07:00

media

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

mining

Makes the startup time significantly faster

2016-04-16 00:58:20 -04:00

mob

Resolves conflict in interface/stylesheet.dm

2016-04-20 14:44:24 -07:00

nano

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

ninja

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

paperwork

Adds Orluum to silicon dms, fixes random skin tone

2016-04-14 14:40:25 -07:00

pda

Fixes cyborg pdas

2016-04-08 15:00:52 -04:00

pooling

…

power

-tg- screen alerts

2016-04-16 14:27:03 -07:00

procedural_mapping

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

projectiles

Merge pull request #4158 from Fox-McCloud/killer-tomato

2016-04-14 19:12:34 -04:00

reagents

Merge pull request #4221 from tigercat2000/tgalerts

2016-04-19 19:13:31 -04:00

recycling

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

research

abductor tech

2016-04-18 19:17:46 -04:00

scripting

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

security_levels

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

shuttle

Makes the startup time significantly faster

2016-04-16 00:58:20 -04:00

space_transition

…

store

…

surgery

Resolves conflict in interface/stylesheet.dm

2016-04-20 14:44:24 -07:00

telesci

Reduce lines by removing blank lines added by PJ's script

2016-04-05 08:25:57 -07:00

tooltip

-tg- screen alerts

2016-04-16 14:27:03 -07:00

tram

…

vehicle

no, no. i clean.

2016-04-10 07:26:24 -04:00