variableundefined 1a7461fab7 Actually fixes conflicts!

2018-09-27 17:39:28 +08:00

..

admin

adds additional check for protected jobs in one-click-antag

2018-09-22 17:50:24 +01:00

alarm

…

antagonists

…

arcade

Fixes claw game

2018-09-06 14:43:43 +08:00

assembly

Add noise sensor and add muzzles to protolathe

2018-08-14 00:53:39 -04:00

atmos_automation

…

awaymissions

Merge pull request #9443 from alex-gh/gateway_fix

2018-09-09 17:59:16 -04:00

busy_space

…

client

spacing

2018-08-28 16:05:39 -04:00

clothing

fixes the fix

2018-09-20 23:47:26 +01:00

countdown

…

crafting

…

customitems

Actually fixes conflicts!

2018-09-27 17:39:28 +08:00

detective_work

…

economy

Remove excessive var and add one missing return statement

2018-09-05 07:45:10 +08:00

error_handler

…

events

Merge pull request #9255 from variableundefined/EconomyRefactor

2018-09-04 17:14:25 -07:00

examine

…

ext_scripts

…

fancytitle

…

fish

…

flufftext

nightmare

2018-09-07 17:20:28 -04:00

food_and_drinks

Merge pull request #8811 from FalseIncarnate/kitchen

2018-09-26 17:32:39 -07:00

games

Bugfixes for polaris card

2018-08-08 22:21:19 +08:00

holiday

…

hydroponics

added soybeanoil to soybeans, juice now for soymilk

2018-09-12 17:21:03 -05:00

karma

Changes karma refund to use switches

2018-07-28 17:28:58 -04:00

library

Cleans out various macro redefinitions or useless use of syntax

2018-07-30 23:24:35 -07:00

lighting

…

logic

…

map_fluff

…

martial_arts

Clean up some grabs

2018-09-16 12:28:39 -07:00

mining

failure messages, depot outgoing redspace portal

2018-08-16 00:57:59 -07:00

mob

Merge pull request #9621 from variableundefined/NerfPlasmaMan

2018-09-26 22:02:20 -07:00

modular_computers

Paving the path for a bigger inventory refactor

2018-09-23 22:26:10 +08:00

nano

…

ninja

Clean up some grabs

2018-09-16 12:28:39 -07:00

paperwork

Ghosts can no longer eject IDs from fax machines and ID computers.

2018-09-09 00:28:14 +02:00

pda

…

persistence

…

power

Fixes wire cutting runtime and other potential runtime.

2018-08-29 20:02:42 +08:00

procedural_mapping

…

projectiles

Merge pull request #9284 from variableundefined/KineticAccelerator

2018-08-22 22:31:57 -07:00

reagents

added soybeanoil to soybeans, juice now for soymilk

2018-09-12 17:21:03 -05:00

recycling

Fixes #9607

2018-09-24 15:16:16 -07:00

research

Merge pull request #9369 from variableundefined/Analyzer

2018-09-04 09:04:14 -07:00

ruins

…

scripting

Update Telecomms.dm

2018-09-08 21:27:32 +01:00

security_levels

…

shuttle

…

space_management

…

spacepods

fixes merge conflict

2018-08-01 04:13:22 -07:00

station_goals

…

store

Fixed Merch Store Typos

2018-08-02 18:04:58 -04:00

surgery

Update robotics.dm

2018-09-15 22:08:18 -05:00

telesci

failure messages, depot outgoing redspace portal

2018-08-16 00:57:59 -07:00

tooltip

…

tram

…

vehicle

…

vr

…