Crazy Lemon c02a561a5a Merge pull request #8283 from Kyep/no_peace ...

Removes peacekeepers

2017-12-05 15:12:56 -08:00

..

admin

Fix R_SPAWN exploit w/ JSON serialization

2017-12-04 14:49:11 -08:00

alarm

…

arcade

…

assembly

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

atmos_automation

…

awaymissions

Merge pull request #7832 from Fox-McCloud/lungsss

2017-12-01 17:51:19 -08:00

busy_space

Metastation is named, finally! NSS Cerebron. Also tweaks the delays.

2017-10-26 12:10:29 -07:00

client

Added laceup shoes

2017-11-16 18:19:18 -05:00

clothing

Merge pull request #7832 from Fox-McCloud/lungsss

2017-12-01 17:51:19 -08:00

countdown

…

crafting

…

customitems

i thought i commited this...

2017-10-08 18:37:34 -04:00

detective_work

…

economy

…

error_handler

…

events

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

examine

…

ext_scripts

…

fancytitle

…

fish

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

flufftext

…

food_and_drinks

Merge pull request #8331 from uraniummeltdown/effectfiles

2017-11-26 12:35:01 -08:00

garbage_collection

…

holiday

…

hydroponics

Merge pull request #8399 from uraniummeltdown/hydrofix

2017-11-27 06:37:18 -05:00

karma

…

library

…

lighting

…

logic

…

map_fluff

Metastation is named, finally! NSS Cerebron. Also tweaks the delays.

2017-10-26 12:10:29 -07:00

martial_arts

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

mining

Merge pull request #8359 from uraniummeltdown/airlock

2017-12-02 11:33:23 -08:00

mob

Merge pull request #8283 from Kyep/no_peace

2017-12-05 15:12:56 -08:00

modular_computers

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

nano

Merge remote-tracking branch 'upstream/master' into radio_comms_fluff

2017-10-26 12:02:31 -07:00

ninja

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

paperwork

Merge pull request #7800 from Citinited/clipboard-improvements

2017-10-15 19:40:57 -07:00

pda

…

persistence

…

power

Merge pull request #7832 from Fox-McCloud/lungsss

2017-12-01 17:51:19 -08:00

procedural_mapping

…

projectiles

Merge pull request #8374 from Fox-McCloud/shotguns-OP

2017-11-30 11:08:24 -08:00

reagents

Fixes merge conflict

2017-11-28 22:39:01 -08:00

recycling

…

research

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

ruins

…

scripting

…

security_levels

Merge remote-tracking branch 'upstream/master' into radio_comms_fluff

2017-10-26 12:02:31 -07:00

shuttle

Merge remote-tracking branch 'upstream/master' into radio_comms_fluff

2017-10-26 12:02:31 -07:00

space_management

…

spacepods

Merge pull request #8331 from uraniummeltdown/effectfiles

2017-11-26 12:35:01 -08:00

station_goals

Merge pull request #7832 from Fox-McCloud/lungsss

2017-12-01 17:51:19 -08:00

store

…

surgery

Merge pull request #7832 from Fox-McCloud/lungsss

2017-12-01 17:51:19 -08:00

telesci

compiles, find and replace particle_effect and effect_system

2017-11-04 20:16:01 +04:00

tooltip

…

tram

…

vehicle

Atmos Fix

2017-11-11 00:10:21 -05:00

vr

…