Commit Graph
985 Commits
Author SHA1 Message Date
skull132 95e0dd8893 Fixes #377
Pasted the access log input and admin message for a failed login while
the SQL database is being utilized. Should function as intended,
hopefully.
2015-02-18 20:17:20 +02:00
skull132 e6a20c81f6 Fixes #372
Pulls over the bits left unpulled. Works as intended with the
directions, now.
2015-02-18 18:38:05 +02:00
SoundScopes 6d945b97d2 Duty Officers 2015-02-18 15:08:03 +00:00
skull132 553eefafa9 Fixes #375 2015-02-18 16:07:08 +02:00
skull132 0d75b92408 Revert "Phorontech to Plasmatech"
This reverts commit b5d01227c2.
2015-02-18 15:40:11 +02:00
skull132 b5d01227c2 Phorontech to Plasmatech
Minor oversight, fixed.
Pointed out in issue #375
2015-02-18 07:52:45 +02:00
Meowykins 377f18c842 Revert "Armband change."
This reverts commit 48a5ed8627.
2015-02-16 21:19:13 -06:00
Meowykins 48a5ed8627 Armband change.
Hold.
2015-02-16 21:11:22 -06:00
Meowykins 18e67fbd2d Initial Fix - Need More
In regard to armbands. Need further progress.
2015-02-16 18:24:46 -06:00
Meowykins 7bd8459435 Watch Fix
Everybody can wear watches now.
2015-02-15 20:54:59 -06:00
Meowykins 885373c8f9 Merge pull request #4 from Aurorastation/master
Stuff
2015-02-15 19:10:06 -06:00
Meowykins 5b89fd6995 Removing Dumbness.
Turns out, this doesn't help, nor is it needed.
2015-02-15 18:22:00 -06:00
Meowykins 8e88f01139 Mice Fix
Can now pick up newly spawned mice.
2015-02-15 18:20:06 -06:00
SoundScopes 39ea10683b Merge pull request #23 from Aurorastation/development
Development
2015-02-15 19:18:11 +00:00
skull132 17d46c6933 Merge pull request #345 from Zuhayr/mining
Baymining
2015-02-15 21:17:24 +02:00
skull132 d00d3a3216 Merge pull request #368 from Meowykins/master
Minor changes/additions
2015-02-15 21:05:53 +02:00
Meowykins 222052e5ba IPC Fixes
IPCs can wear helmets without dying now, barring space helmets.
They don't get peppersprayed either, making them OP officers.
2015-02-14 21:47:21 -06:00
Meowykins e0d0c35bbb Holder - Mice/Lizards
Holdable Mice and Lizards. Added icons to Objects, so they have object
icons.
2015-02-14 21:38:40 -06:00
SoundScopes f8c3960aad Update warning.dm 2015-02-14 21:44:28 +00:00
SoundScopes 512b67d197 More BST stuff 2015-02-13 12:52:18 +00:00
SoundScopes 5d28405cc4 Xenos are back 2015-02-13 12:52:05 +00:00
SoundScopes ee442aee04 Armbands 2015-02-13 09:43:05 +00:00
Meowykins d96cc75fe7 Revert "Revert "Things""
This reverts commit 9344369765d12dd9c4a9b15728c766763eee2ca3.
2015-02-12 22:43:33 -06:00
Meowykins 85fec34b2e Revert "Things"
This reverts commit 0385cb4e303358c28aa7250edbabac135be1f89c.
2015-02-12 22:43:30 -06:00
Meowykins 2237802974 Things
Stuff
2015-02-12 22:43:26 -06:00
SoundScopes 3ca7670860 Merge pull request #367 from SoundScopes/master
Vampire Job bans
2015-02-08 14:28:16 +00:00
SoundScopes 56a032b6c0 Vampire Job bans 2015-02-08 14:25:59 +00:00
skull132 acf8807c49 More debug removal
Yes, skull is bad.
2015-02-08 16:03:17 +02:00
skull132 d6f74202b3 Removes the debug from warnings and adds a notice for the client that was warned, with instructions on how to check up on it. 2015-02-08 15:37:06 +02:00
SoundScopes 127cb14f69 Merge pull request #22 from Aurorastation/development
Development
2015-02-07 23:19:53 +00:00
SoundScopes f8a19d9a59 log update 2015-02-05 06:33:53 +00:00
SoundScopes 0cbbd51268 IPC Immune to Stings and Vampires 2015-02-05 04:09:28 +00:00
SoundScopes 652cbe5757 rjv 2015-02-04 02:33:40 +00:00
skull132 d92bab7e01 Merge branch 'development' of https://github.com/Aurorastation/Aurora into adminthings 2015-02-02 15:16:06 +02:00
skull132 bd4481498b Merge pull request #364 from SoundScopes/master
msg_attack update
2015-02-02 15:14:57 +02:00
skull132 4737761d43 second, final commit. Lacking SQL schema, will be added later. 2015-02-02 15:13:46 +02:00
SoundScopes f73d729ef5 We get a multitool 2015-02-01 18:46:21 +00:00
SoundScopes ddbfb9bb58 Why is it item_color? 2015-02-01 18:46:07 +00:00
SoundScopes 3202fc3b0a msg_attack update 2015-01-31 14:45:47 +00:00
skull132 98958e3a78 Base code for warnings and related systems.
Main feature: warning.dm
2015-01-31 15:28:49 +02:00
Zuhayr 4d022a5e85 Hunting down and killing bugs with the mining port. 2015-01-31 20:04:37 +10:30
Zuhayr 844fa12117 Merge resolution. 2015-01-31 19:09:20 +10:30
skull132 08f5324e39 Merge pull request #362 from SoundScopes/master
Scopes Updates
2015-01-30 16:50:04 +02:00
SoundScopes 087d9785d9 forensics runtime bug 2015-01-26 08:22:14 +00:00
skull132 803794eaba IsBanned Debug
Adds a debug message as to when a blacklist check is completed. Enables
us to actually time the check.
2015-01-23 22:35:05 +02:00
skull132 522a163595 Merge pull request #357 from SoundScopes/master
Scopes updates
2015-01-23 01:06:41 +02:00
skull132 15faa9fd5b Merge pull request #358 from skull132/development
Skull's Things, 22JAN2014
2015-01-23 01:06:33 +02:00
SoundScopes 6fef1b855e Merge pull request #20 from Aurorastation/development
Code Catchup
2015-01-22 23:03:30 +00:00
skull132 51e728cc86 Detective & Forensic Tech Update
* Segragates access
* One more thing that I forgot-- Detective has an alt title
2015-01-23 01:02:23 +02:00
SoundScopes 70b1382dba Merge pull request #17 from Duck-/master
Removes autoheal + fixes tcomms broadcast
2015-01-22 23:02:11 +00:00