IK3I ad5c5dca39 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' ...

# Conflicts:
#	_maps/map_files/cyberiad/cyberiad.dmm

2016-04-27 18:20:50 -05:00

..

admin

Merge pull request #4283 from Tastyfish/checkout-my-moves

2016-04-26 19:13:09 -04:00

alarm

…

arcade

Gunshot sounds, uplink references, less spammy tommygun, fixes

2016-04-25 11:32:48 +02: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

-tg- OOP Hud Refactor

2016-04-21 20:28:08 -07:00

client

Merge pull request #4262 from KasparoVy/IPC-EXTRA-STUFF-REFACTOR

2016-04-26 19:15:19 -04:00

clothing

Merge pull request #4267 from tigercat2000/CRAZY_HUDS_AMIRITE

2016-04-25 19:57:59 -04:00

computer3

Ports /tg/ Foam Force guns

2016-04-22 23:35:55 +02: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

Fix multiple instances of to_chat not being used

2016-04-23 20:45:37 -07:00

karma

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

2016-04-05 08:25:57 -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

martial_arts

lol2chat

2016-04-24 00:22:37 -04:00

media

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

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

mining

Merge pull request #4267 from tigercat2000/CRAZY_HUDS_AMIRITE

2016-04-25 19:57:59 -04:00

mob

Fixes reviving while restrained

2016-04-27 04:22:47 -04:00

nano

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

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

ninja

-tg- OOP Hud Refactor

2016-04-21 20:28:08 -07:00

paperwork

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

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

pda

Fix multiple instances of to_chat not being used

2016-04-23 20:45:37 -07:00

pooling

…

power

Merge pull request #4189 from Fox-McCloud/xenobio-additions

2016-04-26 20:23:49 -04: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 #4270 from FlattestGuitar/foamforce

2016-04-27 11:43:55 -04:00

reagents

Merge pull request #4189 from Fox-McCloud/xenobio-additions

2016-04-26 20:23:49 -04:00

recycling

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

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

research

Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'

2016-04-27 18:20:50 -05: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

Fixes shuttle smoothing

2016-04-21 21:35:53 -04:00

space_transition

…

store

…

surgery

Attaching a prosthetic head that isn't a monitor won't cause you to go bald & Fixes disembodied prosthetic heads being bald & ...

2016-04-21 19:59:11 -04: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