Mieszko Jędrzejczak 22a753957d Conflicts!

2017-04-16 19:21:20 +02:00

..

admin

Loyalty implant -> Mindshield Implant

2017-04-09 16:50:51 +01:00

alarm

AI Restorer and Alarm Monitor.

2017-02-20 11:44:34 -03:00

arcade

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

assembly

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

atmos_automation

UID mass replace: src=\ref[datum]

2016-09-05 23:12:08 -04:00

awaymissions

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

client

Changes beret color to a medical doctor uniform white. Removes certain jobs that probably wouldn't be given one as well. Also updates the flavor text to not be about a blue beret.

2017-04-14 08:13:42 -06:00

clothing

Changes beret color to a medical doctor uniform white. Removes certain jobs that probably wouldn't be given one as well. Also updates the flavor text to not be about a blue beret.

2017-04-14 08:13:42 -06:00

computer3

Implement usesound/toolspeed

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

countdown

Cloning Update

2016-08-31 01:48:02 -04:00

crafting

Merge pull request #6705 from davipatury/crafting-ui

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

customitems

Fluffpocalypse

2017-04-15 22:05:15 +02: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

Integrates UIDs into View Variables

2016-09-08 19:04:50 -04:00

events

Adds debugging jump to link for admins during brand intelligence events

2017-04-01 16:54:09 -07: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

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

garbage_collection

forgot rights check

2017-04-02 19:40:05 -04:00

holiday

…

hydroponics

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

karma

Removes pre-confirmation warning from karma gifting.

2017-04-09 22:35:53 +02:00

library

Implement usesound/toolspeed

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

lighting

Lighting performance/profiling tweaks

2017-02-19 23:37:54 -05:00

logic

UID mass replace: src=\ref[src]

2016-09-05 23:02:10 -04:00

martial_arts

Ports over the status effect unification

2016-10-23 15:45:35 -07:00

mining

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

mob

Merge pull request #7080 from SamHPurp/loyalty-to-mindshield

2017-04-11 19:50:59 -04:00

modular_computers

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

nano

Merge pull request #6705 from davipatury/crafting-ui

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

ninja

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

paperwork

Merge pull request #7054 from Fox-McCloud/destroy-qdelnull

2017-04-05 23:49:19 -07:00

pda

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

persistence

Adds extra documentation for json_to_object

2016-08-10 23:54:17 -07:00

power

Merge pull request #7061 from Fox-McCloud/damn-cells

2017-04-09 13:55:30 -07:00

procedural_mapping

…

projectiles

Merge pull request #7061 from Fox-McCloud/damn-cells

2017-04-09 13:55:30 -07:00

reagents

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

recycling

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

research

Merge pull request #7054 from Fox-McCloud/destroy-qdelnull

2017-04-05 23:49:19 -07:00

ruins

…

scripting

Refactors tcomms stuff a little

2017-02-24 18:10:08 -08:00

security_levels

Comms program.

2017-02-21 12:37:28 -03:00

shuttle

effect/spider to structure/spider

2017-03-27 19:01:25 -03:00

space_management

Ports Monster's finishing of the space allocator

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

spacepods

Merge pull request #7061 from Fox-McCloud/damn-cells

2017-04-09 13:55:30 -07:00

station_goals

conflict fixing.

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

store

Nano-Mob Hunter GO! WIP commit 3: The committening

2016-09-06 04:15:44 -04:00

surgery

Converts Most Destroys to use QDEL_NULL

2017-04-04 23:08:41 -04:00

telesci

Merge pull request #7061 from Fox-McCloud/damn-cells

2017-04-09 13:55:30 -07:00

tooltip

…

tram

Switches over to the new system

2017-01-17 13:57:07 +01:00

vehicle

conflict fixing.

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