Terilia ae88de8669 Trying to solve the merge conflicts.

2018-03-13 04:50:25 +00:00

..

admin

Add another step_ variable to the warning list....

2018-01-26 12:34:48 -08:00

alarm

…

arcade

…

assembly

…

atmos_automation

…

awaymissions

…

busy_space

…

client

Merge pull request #8619 from MarcellusPye/GhostPrefs

2018-01-29 14:18:34 -08:00

clothing

repaths /obj/effect/overlay/temp to /obj/effect/temp_visual

2018-01-18 13:03:49 +05:00

countdown

…

crafting

…

customitems

Trying to solve the merge conflicts.

2018-03-13 04:50:25 +00:00

detective_work

…

economy

Update Accounts.dm

2018-01-09 21:31:11 +01:00

error_handler

…

events

…

examine

…

ext_scripts

…

fancytitle

…

fish

…

flufftext

…

food_and_drinks

adds condition to prevent chugging of unopened containers

2018-02-08 14:48:33 +00:00

garbage_collection

…

holiday

No holidays fer u

2018-02-09 08:20:21 +01:00

hydroponics

strange_reagent bug fix

2018-01-22 23:42:03 -06:00

karma

…

library

…

lighting

Remove unneeded proc

2018-01-24 00:53:12 -06:00

logic

…

map_fluff

…

martial_arts

…

mining

airlock assembly states have defines, removed redundant door layer defines

2018-01-22 20:27:34 +05:00

mob

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

2018-02-08 02:31:44 -05:00

modular_computers

…

nano

…

ninja

…

paperwork

Add glow to edagger

2018-01-22 19:02:20 -06:00

pda

…

persistence

…

power

Merge pull request #8543 from IK3I/I-SAID-CANCEL!

2018-01-24 15:41:36 -08:00

procedural_mapping

…

projectiles

Oops. Emitter beams should have a green glow

2018-01-25 00:52:24 -06:00

reagents

DIE OLD CODE,DIE!

2018-01-26 13:50:56 -05:00

recycling

…

research

Merge pull request #8590 from IK3I/RiseOfSpork

2018-02-05 12:49:59 -08:00

ruins

…

scripting

…

security_levels

…

shuttle

Merge pull request #8664 from RyanSmake/muhspessnamez

2018-02-09 13:18:22 -08:00

space_management

…

spacepods

Better wording+span ending

2018-01-24 22:09:53 +01:00

station_goals

…

store

…

surgery

Allows castration

2018-02-09 20:18:04 -05:00

telesci

…

tooltip

…

tram

…

vehicle

repaths /obj/effect/overlay/temp to /obj/effect/temp_visual

2018-01-18 13:03:49 +05:00

vr

…