Kyep 2c02c7bbc0 Removes pulling changes

2018-04-01 21:29:28 -07: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

…

client

Merge pull request #8292 from Kyep/ability_requirements

2017-12-05 15:25:36 -08:00

clothing

Merge pull request #7832 from Fox-McCloud/lungsss

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

countdown

…

crafting

…

customitems

Adds Dethamos's fluff (For real this time) (#8450)

2017-12-23 18:38:31 -08:00

detective_work

…

economy

Squish

2017-12-02 01:28:40 -05:00

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 #8400 from uraniummeltdown/hydrocycles

2017-12-15 19:13:49 -05:00

karma

…

library

…

lighting

…

logic

…

map_fluff

…

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

Removes pulling changes

2018-04-01 21:29:28 -07:00

modular_computers

compiles, find and replace particle_effect and effect_system

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

nano

…

ninja

compiles, find and replace particle_effect and effect_system

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

paperwork

…

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

proc tweak and name change

2017-12-14 12:15:33 -05:00

ruins

…

scripting

…

security_levels

…

shuttle

…

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

Changes umpteen vars back to a list, similar to what simple mobs have for damage coefficients

2017-12-15 13:20:00 -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

…