Crazy Lemon bd7540a3f9 Merge pull request #9159 from MINIMAN10000/pod-eject ...

Restrained spacepod passenger can now exit pod after 2 minutes

2018-07-03 12:05:04 -07:00

..

admin

Merge pull request #9064 from Anasari/MoreClickAntag

2018-06-13 18:43:18 -07:00

alarm

Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings

2018-05-31 19:34:47 -07:00

antagonists

Datumizes Wishgranter

2018-05-20 15:48:29 -04:00

arcade

Merge remote-tracking branch 'upstream/master' into more_ss_ports

2018-04-30 09:27:11 -07:00

assembly

Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)

2018-06-13 16:55:21 -07:00

atmos_automation

Removes All Weapons

2018-04-15 16:25:56 -04:00

awaymissions

Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings

2018-05-31 19:34:47 -07:00

busy_space

…

client

Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)

2018-06-13 16:55:21 -07:00

clothing

Cut code duplication, added sprites

2018-06-29 20:22:22 +02:00

countdown

Ports TG's Garbage Subsystem

2018-03-28 20:02:39 -04:00

crafting

Ports Guillotine

2018-04-27 18:58:23 -04:00

customitems

merge conflicts

2018-07-01 02:42:31 -04:00

detective_work

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

economy

Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings

2018-05-31 19:34:47 -07:00

error_handler

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

events

Merge remote-tracking branch 'upstream/master' into weather-subsystem

2018-06-13 16:56:19 -04:00

examine

Removes All Weapons

2018-04-15 16:25:56 -04:00

ext_scripts

Whoops

2018-03-22 15:41:33 -07:00

fancytitle

…

fish

Merge remote-tracking branch 'upstream/master' into attack-hulk

2018-06-03 18:49:44 -04:00

flufftext

Their

2018-05-25 18:34:24 -07:00

food_and_drinks

Merge pull request #9040 from Anasari/CryoLog

2018-07-01 00:47:39 -07:00

holiday

Removes All Weapons

2018-04-15 16:25:56 -04:00

hydroponics

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

karma

Completely Overhaul Logging

2018-04-19 15:07:59 -08:00

library

Fix his, he, him

2018-05-25 18:34:28 -07:00

lighting

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

logic

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

map_fluff

…

martial_arts

Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)

2018-06-13 16:55:21 -07:00

mining

coin string fix

2018-06-17 18:14:52 -07:00

mob

Merge pull request #9140 from Crazylemon64/mmi_radio_upgrade

2018-07-01 22:19:18 -04:00

modular_computers

Removes the last of the color macros

2018-05-23 14:05:17 -04:00

nano

Adds a radio MMI upgrade module, printable in the mech fab

2018-06-24 13:32:36 -07:00

ninja

Replace \his, \he, \him, \himself

2018-05-25 18:39:37 -07:00

paperwork

Merge branch 'master' into LabelerLogging

2018-06-30 20:19:53 -07:00

pda

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

persistence

…

power

Better method of deffered processing

2018-06-18 12:10:16 -07:00

procedural_mapping

Removes All Weapons

2018-04-15 16:25:56 -04:00

projectiles

Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)

2018-06-13 16:55:21 -07:00

reagents

Merge branch 'master' into CryoLog

2018-06-26 16:24:29 +08:00

recycling

Merge pull request #9047 from Citinited/conveyor-belt-placer

2018-06-29 21:11:49 -07:00

research

Merge pull request #9140 from Crazylemon64/mmi_radio_upgrade

2018-07-01 22:19:18 -04:00

ruins

…

scripting

Merge remote-tracking branch 'upstream/master' into tcomms_optimize

2018-06-07 15:04:57 -07:00

security_levels

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

shuttle

Remove bad #undef's and conflicting macros for SpacemanDMM to stop throwing warnings

2018-05-31 19:34:47 -07:00

space_management

Converts and Updates Weather Subsystem

2018-05-21 00:01:18 -04:00

spacepods

not do_after, not equal concious, warn pilot if there is one

2018-07-02 11:09:35 -07:00

station_goals

SS Conversion: Atoms, Machines, n' Mobs

2018-04-28 17:55:15 -07:00

store

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

surgery

Fixes #8954 - splits 'attack log' preference, spam-be-gone (#8992)

2018-06-13 16:55:21 -07:00

telesci

Merge remote-tracking branch 'upstream/master' into more_ss_ports

2018-04-30 09:27:11 -07:00

tooltip

…

tram

…

vehicle

Removes All Weapons

2018-04-15 16:25:56 -04:00

vr

Removes All Weapons

2018-04-15 16:25:56 -04:00