ZomgPonies 76237792ca Merge pull request #327 from tigercat2000/FreezeMob ...

Port of  admin freeze verb from NSS Pheonix [FEATURE] [Do Not Merge]

2015-02-20 07:44:54 -05:00

..

admin

Extra Freeze features- Prevent direct touching and pulling

2015-02-20 05:16:03 +01:00

assembly

Merge with upstream/master

2015-02-18 13:41:32 -05:00

awaymissions

Revert "Saycode/language/species port from Bay"

2015-02-19 20:15:42 -05:00

client

Revert "Saycode/language/species port from Bay"

2015-02-19 20:15:42 -05:00

clothing

MERGE CONFLIIIIIICTS

2015-02-19 20:26:36 -05:00

computer3

Merge with upstream/master

2015-02-19 19:38:48 -05:00

customitems

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

destilery

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

DetectiveWork

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

economy

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

events

Move mass hallucination event to moderate, change weight of cargo bonus

2015-02-16 23:05:25 +01:00

ext_scripts

…

flufftext

Crossbow Rework

2015-02-03 23:35:09 -05:00

food

…

games

…

genetics

…

genetics2

…

hydroponics

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

icon generation

…

jungle

Defib update, cell path update

2015-02-09 16:12:01 +01:00

karma

Revert "Saycode/language/species port from Bay"

2015-02-19 20:15:42 -05:00

library

Merge with upstream/master

2015-02-18 13:41:32 -05:00

liquid

…

media

Remove jukebox debug

2015-01-31 15:38:16 +01:00

mining

Merge pull request #342 from Fox-McCloud/MiningSounds

2015-02-20 07:42:34 -05:00

mob

Extra Freeze features- Prevent direct touching and pulling

2015-02-20 05:16:03 +01:00

nano

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

organs

Part 2 of saycode/language/species port from Bay. Also includes bugfixes.

2015-02-20 00:50:28 +01:00

paperwork

MERGE CONFLIIIIIICTS

2015-02-19 20:26:36 -05:00

power

Merge with upstream/master

2015-02-18 13:41:32 -05:00

projectiles

Removes TABLEPASS and FPRINT flags

2015-02-10 17:41:37 -05:00

reagents

Merge with upstream/master

2015-02-19 19:38:48 -05:00

recycling

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

research

MERGE CONFLIIIIIICTS

2015-02-19 20:26:36 -05:00

scripting

…

security levels

Z-level check refactor

2015-02-16 20:33:28 +01:00

shieldgen

Blob event fixes, toggle preferences age check, jobban check

2015-02-01 14:19:11 +01:00

shuttles

Announcement system overhaul, crew monitor system overhaul, add portable crew monitor

2015-02-16 19:03:29 +01:00

store

Z-level check refactor

2015-02-16 20:33:28 +01:00

supermatter

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00

surgery

Revert "Saycode/language/species port from Bay"

2015-02-19 20:15:42 -05:00

telesci

Merge with upstream/master

2015-02-18 13:41:32 -05:00

vehicles

Merge with upstream/master

2015-02-18 13:41:32 -05:00

virus2

NODROP flag addition & handling

2015-02-18 13:22:41 -05:00