Jamini f3bb52c9a7 Squashed commit of the following: ...

commit 9af16b9757
Merge: 3258c82 9a4d7b7
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sun Mar 8 22:07:35 2015 +0200

    Merge pull request #437 from Aurorastation/development

    Update, 08MAR2015

commit 9a4d7b7dff
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sun Mar 8 22:06:54 2015 +0200

    Changelog Addendum, 08MAR2015

    Missed some things!

commit 0a1740fcf3
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sun Mar 8 21:56:41 2015 +0200

    Map Update 2, 08MAR2015

    * Adds the resource vendor into the game

commit 07f456558d
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sun Mar 8 21:52:05 2015 +0200

    Changelog, 08MAR2015

commit 7a9e981486
Merge: c461bfa 6ec29dc
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sun Mar 8 21:34:33 2015 +0200

    Merge pull request #436 from skull132/master

    Master

commit 6ec29dcb51
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sun Mar 8 21:29:42 2015 +0200

    Map Update, 08MAR2015

    * Fixes #422
    * Adds a proper surgical gear to the roboticist
    * Covers a blindspot in the main hall for the AI

commit 51886224ee
Merge: 37dc607 c461bfa
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sun Mar 8 21:01:21 2015 +0200

    Merge pull request #29 from Aurorastation/development

    Conflict Clearance

commit c461bfa430
Merge: fb726d4 37dc607
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sun Mar 8 20:52:21 2015 +0200

    Merge pull request #435 from skull132/master

    Skull's Things, 07MAR2015

commit 37dc607491
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sun Mar 8 18:37:47 2015 +0200

    Item_defines.dm Clean-up

    * Fixes #429
    * Fixes #394
    * Removes Crimson's Webbing
    * Makes Janet Bellard's handkerchief more space efficient and less dumb
    * Modifications to make most of the old items more uniform in the way
    their code is written and presented

commit 831a457c25
Merge: 00b97c0 fb726d4
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sun Mar 8 15:02:30 2015 +0200

    Merge pull request #28 from Aurorastation/development

    Conflict Clearance

commit fb726d4645
Merge: b6299cb df99bfa
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sun Mar 8 14:59:29 2015 +0200

    Merge pull request #425 from Serveris/development

    Custom items

commit b6299cb2c0
Merge: 04fed60 7416522
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sun Mar 8 14:59:07 2015 +0200

    Merge pull request #424 from Jamini/development

    Fixing EMT access to medical lockers

commit 04fed60c45
Merge: dab11dc decaf5d
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sun Mar 8 14:58:51 2015 +0200

    Merge pull request #426 from Meowykins/master

    Mostly new stuff.

commit df99bfa32d
Merge: 906e2ef dab11dc
Author: Serveris <blh1997@hotmail.com>
Date:   Sat Mar 7 19:23:45 2015 -0500

    Merge pull request #3 from Aurorastation/development

    Conflict Clearance

commit dab11dc481
Merge: 199371b ba1cd8f
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sun Mar 8 01:26:35 2015 +0200

    Merge pull request #427 from SoundScopes/master

    Scopes Updates

commit 00b97c04cc
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sat Mar 7 15:09:40 2015 +0200

    Possible Fix #418

    Adds a list of items of, initially empty, food holders into a blocked
    variable. This should stop empty food items from spawning, also empty
    food items with no icons as well. Works as tested.

commit b83cdc9a3f
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sat Mar 7 14:46:19 2015 +0200

    Chocolatebox

commit 09cbc8cc61
Author: skull132 <erki.meinberg@gmail.com>
Date:   Sat Mar 7 14:30:34 2015 +0200

    Weaponry.dm Updates

    * Fixes #431 by redoing the canesword (disguised sword). Makes you able
    to lock it by clicking on it, and unsheathe it by clicking on it with
    another hand.
    * Removes the old box-hack for having a canesword.
    * Swaps out references for the old canesword.
    * Modifies how deconversion with the null rod works, to be less ganky.

commit ba1cd8f0f1
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Fri Mar 6 15:48:50 2015 +0000

    Grammar

commit 05315a863f
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Fri Mar 6 15:48:37 2015 +0000

    Sniper needs Zoom

commit 6f0135b2a9
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Fri Mar 6 15:02:15 2015 +0000

    Only aim when scoping

commit c6a3bd8a8d
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Fri Mar 6 14:31:39 2015 +0000

    JMP fix

commit 181d610c50
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Fri Mar 6 14:07:21 2015 +0000

    NanoUI Debug

commit b6947e8b61
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Fri Mar 6 14:07:05 2015 +0000

    Closet Space

commit 863cea572a
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Mar 5 17:13:14 2015 +0200

    Radios for Posibrains

    General communication device. Handed in for general testing, reference
    ehancement #400.

    Known bugs:
    * Mob's own speech scrubbed out with asterisks

commit 4a6da81963
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Mar 5 16:00:22 2015 +0200

    Character Signatures

    * Adds the ability for players to have predefined signatures for
    specific characters
    * Should none be entered, it'll revent to the old style, until changed

commit 906e2ef445
Author: Serveris <blh1997@hotmail.com>
Date:   Wed Mar 4 15:12:58 2015 -0500

    Fixes #419

    Fixes the crossbows not appearing on a mob's back.

commit adbf99c092
Merge: 14e0600 4edae7b
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Wed Mar 4 14:50:37 2015 +0000

    Merge branch 'master' of https://github.com/SoundScopes/Aurora

commit 14e060090a
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Wed Mar 4 14:50:29 2015 +0000

    Rights check Dumb

commit 4edae7bb99
Author: SoundScopes <Musical.Flow@live.com>
Date:   Wed Mar 4 05:42:46 2015 +0000

    Re-enable the AI

commit e4b1db68b5
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Tue Mar 3 14:04:35 2015 +0000

    Player Memos

commit 84fd6a1a6c
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Tue Mar 3 13:58:53 2015 +0000

    Armbands

commit ea83e9d5a5
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Tue Mar 3 13:57:19 2015 +0000

    Runtime

    I can stop it attacking Mice now

commit decaf5dc5e
Author: Meowykins <meowness10@gmail.com>
Date:   Mon Mar 2 10:40:58 2015 -0600

    Armor Changes

    Allows security armor to hold flashlights and badges.

commit 15275de5aa
Author: Meowykins <meowness10@gmail.com>
Date:   Mon Mar 2 10:40:32 2015 -0600

    New Storage

    For minerals. Used in RnD and Robotics.

commit 43276af346
Merge: adb0629 3258c82
Author: Meowykins <morgannhart@gmail.com>
Date:   Mon Mar 2 09:23:18 2015 -0600

    Merge pull request #6 from Aurorastation/master

    Update

commit a27036eb35
Author: Serveris <blh1997@hotmail.com>
Date:   Sun Mar 1 19:40:07 2015 -0500

    Custom Items

    -Adds TheCritsyBear/Android's Language Board
    -Adds MasterZipZero/PARAGON's data chip
    -Adds NebulaFlare/Karima Mo'taki's data drive necklace
    -Adds Thundy/Charlie Dove's diamond necklace

commit 79d3b13838
Merge: 562abf5 199371b
Author: Serveris <blh1997@hotmail.com>
Date:   Sat Feb 28 16:49:28 2015 -0500

    Merge pull request #2 from Aurorastation/development

    PR #3

commit 086b3f574f
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Sat Feb 28 10:13:55 2015 +0000

    Incorrect access

commit fe333f320a
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Sat Feb 28 10:13:41 2015 +0000

    Dsay runtime

commit 26b2d7418b
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Sat Feb 28 10:11:26 2015 +0000

    A little change to logs

    Added prefixes for specific logs

commit 863af7bd00
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Fri Feb 27 10:27:26 2015 +0000

    Disposals hurt

    It was actually a bug, how about that.

commit 199371bc1b
Merge: 59e17f7 a9b8154
Author: SoundScopes <Musical.Flow@live.com>
Date:   Fri Feb 27 01:00:16 2015 +0000

    Merge pull request #417 from SoundScopes/master

    Development

commit a9b8154c68
Merge: 293d728 3258c82
Author: SoundScopes <Musical.Flow@live.com>
Date:   Fri Feb 27 00:59:52 2015 +0000

    Merge pull request #26 from Aurorastation/master

    Development

commit 562abf5071
Merge: 04761a0 59e17f7
Author: Serveris <blh1997@hotmail.com>
Date:   Thu Feb 26 19:07:42 2015 -0500

    Merge pull request #1 from Aurorastation/development

    PR #2

commit 9d8349229f
Merge: 05319af 3258c82
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 21:27:45 2015 +0200

    Merge pull request #27 from Aurorastation/master

    Yesss.

commit 3258c82d16
Merge: 23631ec 59e17f7
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 19:34:17 2015 +0200

    Merge pull request #415 from Aurorastation/development

    Remove Emergency Physician

commit 59e17f7e91
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 19:33:30 2015 +0200

    Remove Emergency Physician

    Title no longer necessary. Leave note to scrutinize pulls better.

commit 23631ec809
Merge: 8e71b76 2c8ee1e
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 19:26:14 2015 +0200

    Merge pull request #414 from Aurorastation/development

    Map Hotfix, 26FEB2015

commit 2c8ee1e4d7
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 19:25:03 2015 +0200

    Map Hotfix 2, 26FEB2015

    26FEB, the first one is meant to read. No clue why I'm being silly.

commit c2ed125af2
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 19:07:22 2015 +0200

    Map Hotfix, 18FEB2015

    Tables. Always tables. Temporary bridge design in effect.

commit 8e71b76e11
Merge: 2f242fb 2237cb2
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 17:21:55 2015 +0200

    Merge pull request #412 from Aurorastation/development

    EMT Spawn Fix

commit 2237cb21cb
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 17:20:36 2015 +0200

    EMT Spawn Fix

    Fixes the spawnpoints, a quick mistake.

commit 2f242fbfe5
Merge: 9e6d678 42971d3
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 16:56:39 2015 +0200

    Merge pull request #411 from Aurorastation/development

    Update, 26FEB2015

commit 42971d38e6
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 16:49:22 2015 +0200

    Removing Gravity.html

    Clean-up, basically.

commit 7520ac9cda
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 16:48:18 2015 +0200

    Changelog, 26FEB2015

commit 7c69a6ceab
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 16:29:21 2015 +0200

    Gitignore update

    Can we finally stop updating that file? I hope so.

commit 641e2eb6fa
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 16:29:04 2015 +0200

    Map Update, 26FEB2015

    * Moves the bartender's back room light
    * Adds lockdown shutters to Arrivals, so that it may act as a checkpoint
    (head access)
    * Fixes the mining dock vents with correct IDs

commit 39ace47ad6
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 16:27:56 2015 +0200

    Tidying Up: EMT

commit e6e9fdcc16
Merge: be24690 05319af
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 14:48:07 2015 +0200

    Merge pull request #410 from skull132/master

    Body Colour for IPCs

commit 05319afafa
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 26 14:47:22 2015 +0200

    Body Colour for IPCs

    Because we paint computers, so why not pain IPCs? Also, a bypass already
    exists, so might as well make it official.

    Body colour is linked to the hair colour, so you'll have a uniform
    coating.

commit be24690724
Merge: 6672368 963bec0
Author: skull132 <erki.meinberg@gmail.com>
Date:   Wed Feb 25 21:22:40 2015 +0200

    Merge pull request #403 from Jamini/development

    EMT job and assets added

commit 6672368180
Merge: 15ce683 293d728
Author: skull132 <erki.meinberg@gmail.com>
Date:   Wed Feb 25 21:22:25 2015 +0200

    Merge pull request #398 from SoundScopes/master

    Scopes Updates

commit 293d728ff2
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Wed Feb 25 19:19:18 2015 +0000

    It's your duty to change color

commit 15ce6832fd
Merge: c04fc4c adb0629
Author: skull132 <erki.meinberg@gmail.com>
Date:   Wed Feb 25 21:13:37 2015 +0200

    Merge pull request #402 from Meowykins/master

    Fixes

commit c04fc4ca95
Merge: ac562a4 6d5fa8d
Author: skull132 <erki.meinberg@gmail.com>
Date:   Wed Feb 25 21:13:15 2015 +0200

    Merge pull request #407 from skull132/master

    Skull's Things, 25FEB2015

commit ac562a4332
Merge: 04761a0 9e6d678
Author: skull132 <erki.meinberg@gmail.com>
Date:   Wed Feb 25 21:12:58 2015 +0200

    Merge pull request #408 from Aurorastation/master

    Backtraced Update

commit 9e6d6780e1
Merge: 72500c4 2d37875
Author: skull132 <erki.meinberg@gmail.com>
Date:   Wed Feb 25 17:25:35 2015 +0200

    Merge pull request #391 from Zuhayr/master

    Fixes #388

commit 6d5fa8dd60
Author: skull132 <erki.meinberg@gmail.com>
Date:   Wed Feb 25 17:14:39 2015 +0200

    Report a Bug Button

    Adds a button. Yup.

commit 0f9263aa51
Author: skull132 <erki.meinberg@gmail.com>
Date:   Wed Feb 25 16:59:26 2015 +0200

    Fixes #405

    pAIs can only use sign language with the translator *on* and in the
    mobile form.

commit df229eba31
Author: skull132 <erki.meinberg@gmail.com>
Date:   Wed Feb 25 16:32:21 2015 +0200

    Fixes #399

    pAIs are no longer the ultimate hacking tool for getting into the HoP's
    office, or the warden's office. As in: they can no longer open windoors
    automatically.

commit adb06297a4
Author: Meowykins <meowness10@gmail.com>
Date:   Tue Feb 24 02:19:03 2015 -0600

    #401

    Bugfix for #401

commit 3c10938352
Merge: c970a4d 72500c4
Author: Meowykins <morgannhart@gmail.com>
Date:   Mon Feb 23 20:19:35 2015 -0600

    Merge pull request #5 from Aurorastation/master

    Stuff

commit e0b83b59a4
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Tue Feb 24 01:56:59 2015 +0000

    #384

commit d3bbdb1f46
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Tue Feb 24 00:12:01 2015 +0000

    Color Changes

commit a967f7fffa
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Mon Feb 23 12:44:06 2015 +0000

    Mouse cooldown

commit bca631d622
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Mon Feb 23 11:50:18 2015 +0000

    Stealth Runtime

commit 72500c4472
Merge: 0739b28 04761a0
Author: SoundScopes <Musical.Flow@live.com>
Date:   Mon Feb 23 04:36:51 2015 +0000

    Merge pull request #397 from Aurorastation/development

    Development

commit 04761a0791
Merge: 970dbfd dee4363
Author: SoundScopes <Musical.Flow@live.com>
Date:   Mon Feb 23 04:32:13 2015 +0000

    Merge pull request #395 from SueTheCake/customitems

    Fixes missing icon states for custom items.

commit 970dbfdd9d
Merge: 1a116db d2c523d
Author: SoundScopes <Musical.Flow@live.com>
Date:   Mon Feb 23 04:30:13 2015 +0000

    Merge pull request #396 from SoundScopes/master

    Damn runtimes

commit d2c523de5a
Author: SoundScopes <Musical.Flow@LIve.com>
Date:   Mon Feb 23 03:46:24 2015 +0000

    Damn runtimes

commit dee4363e63
Author: suethecake <suethepyro@gmail.com>
Date:   Sun Feb 22 16:56:40 2015 -0600

    Forgot to add item states for certain objects in the last pull. Durr.

commit 2d378755ff
Author: Zuhayr <AGMogett@gmail.com>
Date:   Sat Feb 21 23:54:39 2015 +1030

    Fixes #388

commit ac250fac7f
Merge: 3a8084a 41321a0
Author: skull132 <erki.meinberg@gmail.com>
Date:   Thu Feb 19 18:15:36 2015 +0200

    Merge pull request #26 from Aurorastation/master

    Hotfix pull

2015-03-08 20:04:17 -04:00

3.8 KiB

160x128px

Raw Permalink History