Crazy Lemon f60dd39a9d Merge pull request #6705 from davipatury/crafting-ui ...

Personal Crafting Nano-UI-ification

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

..

admin

Merge pull request #6816 from Kyep/ahelp_PP_fix

2017-03-21 15:01:07 -04:00

alarm

…

arcade

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

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

assembly

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

atmos_automation

…

awaymissions

Change Door Sounds

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

client

Merge pull request #6776 from FlattestGuitar/shoes

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

clothing

Merge pull request #6814 from Jovaniph/evaspriteupdate

2017-03-20 16:41:59 -04:00

computer3

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

countdown

…

crafting

Merge pull request #6705 from davipatury/crafting-ui

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

customitems

Merge pull request #6710 from uraniummeltdown/coverflags

2017-03-11 04:57:15 -05:00

detective_work

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

economy

conflict fixing.

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

error_handler

…

events

Merge pull request #6734 from uraniummeltdown/plastic

2017-03-15 06:33:02 -04:00

examine

…

ext_scripts

…

fish

Implement usesound/toolspeed

2017-03-07 16:46:28 +01: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

conflict fixing.

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

karma

…

library

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

lighting

…

logic

…

martial_arts

…

mining

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

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

mob

Merge pull request #6705 from davipatury/crafting-ui

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

modular_computers

Layout fix.

2017-03-04 22:02:36 -03:00

nano

Merge pull request #6705 from davipatury/crafting-ui

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

ninja

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

paperwork

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

pda

conflict fixing.

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

persistence

…

power

Fix conflicts.

2017-03-09 12:01:50 -03:00

procedural_mapping

…

projectiles

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

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

reagents

Merge pull request #6494 from Crazylemon64/risky_strange_reagent

2017-03-21 13:11:29 -04:00

recycling

conflict fixing.

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

research

please no merge conflict.

2017-03-11 19:21:06 -05: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

Ports Monster's finishing of the space allocator

2017-03-03 17:47:10 -08:00

spacepods

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

station_goals

conflict fixing.

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

store

…

surgery

Merge pull request #6494 from Crazylemon64/risky_strange_reagent

2017-03-21 13:11:29 -04:00

telesci

Implement usesound/toolspeed

2017-03-07 16:46:28 +01:00

tooltip

…

tram

…

vehicle

conflict fixing.

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