Crazy Lemon 09f7b52f3b Merge pull request #6906 from Fox-McCloud/merge-oddities ...

Fixes Stack Merge Oddities

2017-03-26 23:27:58 -07:00

..

admin

Merge pull request #6679 from Kyep/terrorspiders-PR5

2017-03-27 02:27:19 -04:00

alarm

…

arcade

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into toolz

2017-03-08 10:45:16 +01:00

assembly

…

atmos_automation

…

awaymissions

Merge pull request #6533 from Kyep/gateway_centcomaway

2017-03-26 18:23:21 -04:00

client

Merge pull request #6776 from FlattestGuitar/shoes

2017-03-16 17:46:27 -07:00

clothing

Merge branch 'master' into outfiterinos

2017-03-25 21:20:51 +01:00

computer3

…

countdown

…

crafting

Merge pull request #6705 from davipatury/crafting-ui

2017-03-21 18:00:34 -07:00

customitems

PhantasmicDream fluff item: Witch hat

2017-03-21 15:25:48 -07:00

detective_work

…

economy

conflict fixing.

2017-03-11 05:08:19 -05:00

error_handler

…

events

Don't Fear the Reaper

2017-03-24 04:58:01 -04:00

examine

…

ext_scripts

…

fish

Merge pull request #6699 from FalseIncarnate/fish

2017-03-23 16:02:27 -04:00

flufftext

Change Door Sounds

2017-03-13 06:25:19 -04:00

food_and_drinks

add baseball bat item for 5 wood sheets, baseball burger, admin only reflector bat and homerun bat

2017-03-16 22:33:24 +04:00

garbage_collection

…

holiday

…

hydroponics

CanPass tweak

2017-03-26 00:06:00 -04:00

karma

…

library

…

lighting

…

logic

…

martial_arts

…

mining

Deconstructing or depowering ORMs/MEVs ejects whatever ID is inside.

2017-03-21 17:44:18 -04:00

mob

Merge pull request #6679 from Kyep/terrorspiders-PR5

2017-03-27 02:27:19 -04:00

modular_computers

…

nano

Merge pull request #6705 from davipatury/crafting-ui

2017-03-21 18:00:34 -07:00

ninja

…

paperwork

Pens no longer use comic sans

2017-03-25 02:57:32 -07:00

pda

conflict fixing.

2017-03-11 05:08:19 -05:00

persistence

…

power

Merge pull request #6906 from Fox-McCloud/merge-oddities

2017-03-26 23:27:58 -07:00

procedural_mapping

…

projectiles

Merge pull request #6689 from Fox-McCloud/nerf-shotguns

2017-03-11 15:26:58 -08:00

reagents

Removes Crazylemon

2017-03-22 08:19:33 +01:00

recycling

Switching logic

2017-03-21 19:18:29 +01:00

research

Merge pull request #6717 from Fox-McCloud/laser-scalpel-refactor

2017-03-23 15:20:56 -07:00

ruins

…

scripting

…

security_levels

…

shuttle

added 10% chance for random crate to be added to supply shuttle on calling it to station

2017-03-18 11:19:31 +04:00

space_management

…

spacepods

…

station_goals

conflict fixing.

2017-03-11 05:08:19 -05:00

store

…

surgery

Merge pull request #6679 from Kyep/terrorspiders-PR5

2017-03-27 02:27:19 -04:00

telesci

…

tooltip

…

tram

…

vehicle

conflict fixing.

2017-03-11 05:08:19 -05:00