Arokha Sieyes
|
30a8a3ce31
|
VS edit merges
|
2018-10-20 17:37:08 -04:00 |
|
Neerti
|
3a9c13b937
|
Ports Vote to SMC
|
2018-10-20 01:53:13 -04:00 |
|
Sebbe9123
|
df23ae9891
|
Adds toggle for secpatch
You can now toggle and switch what eye the secpatch covers for all your partial blindness needs.
|
2018-10-18 11:27:04 +02:00 |
|
Spades
|
ea12d3d18c
|
Merge pull request #4328 from lbnesquik/Kates-Citborg-Port
Dogborgs start with full water reserves.
|
2018-10-17 17:28:51 -04:00 |
|
Neerti
|
972777fd94
|
Adds Mods/Dev perms to ticket permission checks (#5683)
|
2018-10-16 18:28:14 -04:00 |
|
Aronai Sieyes
|
92209a64f7
|
Merge pull request #4408 from VOREStation/upstream-merge-5679
[MIRROR] Makes RCDs Clean Again
|
2018-10-16 14:50:40 -04:00 |
|
Aronai Sieyes
|
07377724e2
|
VS Changes to unsimulated.dm
|
2018-10-16 14:42:54 -04:00 |
|
Neerti
|
62ac0986ca
|
Makes RCDs Clean Again
|
2018-10-16 14:17:44 -04:00 |
|
Anewbe
|
9007553a6c
|
Merge pull request #5678 from Neerti/anchored_fix
Fixes two anchored-related bugs, taped papers and the medbay phone.
|
2018-10-16 14:05:10 -04:00 |
|
Aronai Sieyes
|
8c764d487d
|
Merge pull request #4340 from Novacat/nova-pathfinder
Exploration Fixes for 09-27-2018 Sync
|
2018-10-16 12:27:52 -04:00 |
|
Aronai Sieyes
|
c7d9ea6844
|
Merge pull request #4387 from deathride58/dontforgettosanitizeuserinput
Fixes apostrophes in names causing javascript errors in the character directory
|
2018-10-16 12:27:05 -04:00 |
|
Aronai Sieyes
|
ce0450e218
|
Merge pull request #4399 from VOREStation/upstream-merge-5666
[MIRROR] Magazines improvements
|
2018-10-16 12:19:06 -04:00 |
|
Aronai Sieyes
|
3b2d47087f
|
Merge pull request #4397 from VOREStation/upstream-merge-5671
[MIRROR] Prevent people from removing papers from any distances.
|
2018-10-16 12:18:55 -04:00 |
|
Aronai Sieyes
|
872eff5004
|
Merge pull request #4395 from VOREStation/upstream-merge-5670
[MIRROR] Fix a couple of ticket bugs
|
2018-10-16 12:18:46 -04:00 |
|
Aronai Sieyes
|
d66c8e326b
|
Merge pull request #4394 from VOREStation/upstream-merge-5652
[MIRROR] Fixes missing sprites when excavating rocks
|
2018-10-16 12:18:35 -04:00 |
|
Aronai Sieyes
|
fac9a2c121
|
Merge pull request #4393 from VOREStation/upstream-merge-5647
[MIRROR] Add a noise for mining scanners.
|
2018-10-16 12:18:14 -04:00 |
|
Aronai Sieyes
|
78bd63d568
|
Merge pull request #4392 from VOREStation/upstream-merge-5626
[MIRROR] Move almost everything food related into the kitchen module.
|
2018-10-16 12:18:05 -04:00 |
|
Aronai Sieyes
|
9dc2f288a0
|
Clean up two-way merge
|
2018-10-16 12:08:31 -04:00 |
|
Arokha Sieyes
|
ce187f64ed
|
Fixup other vorestation things
Stop using the web editor please
|
2018-10-16 12:05:32 -04:00 |
|
Spades
|
5b755d757a
|
Merge pull request #4396 from VOREStation/upstream-merge-5674
[MIRROR] Removes maintenance access from cleanbots
|
2018-10-15 17:32:14 -04:00 |
|
Kates
|
26089f3a72
|
Magazines improvements
|
2018-10-15 15:52:56 -04:00 |
|
Anewbe
|
935fb1ed06
|
Merge pull request #5669 from VOREStation/pol-binocs
Stop usage of multiple vision modifiers
|
2018-10-15 15:51:43 -04:00 |
|
Anewbe
|
34ee689609
|
Merge pull request #5671 from lbnesquik/Kates-Fax-Fix
Prevent people from removing papers from any distances.
|
2018-10-15 15:51:30 -04:00 |
|
Anewbe
|
8ccd796753
|
Merge pull request #5674 from Nalarac/patch-1
Removes maintenance access from cleanbots
|
2018-10-15 15:50:13 -04:00 |
|
Anewbe
|
6e5a5f5edc
|
Fix a couple of ticket bugs
|
2018-10-15 15:49:58 -04:00 |
|
Anewbe
|
6bf9647ff7
|
Merge pull request #5652 from Cerebulon/excavation_sprite
Fixes missing sprites when excavating rocks
|
2018-10-15 15:48:42 -04:00 |
|
Anewbe
|
8fc3cdfb3e
|
Merge pull request #5647 from lbnesquik/Kates-Mining-Tweak
Add a noise for mining scanners.
|
2018-10-15 15:48:30 -04:00 |
|
Anewbe
|
12e34de332
|
Move almost everything food related into the kitchen module.
|
2018-10-15 15:47:14 -04:00 |
|
deathride58
|
cf9613ebdd
|
fixes apostrophes making it impossible to view someone's info in the character directory
|
2018-10-13 23:38:19 -04:00 |
|
Arokha Sieyes
|
e6bf904252
|
VS edit
|
2018-10-13 19:20:13 -04:00 |
|
Anewbe
|
51a493427d
|
Graves (#5622)
* Adds support for closets storing closets, and graves
* More Grave Things
|
2018-10-13 17:58:48 -04:00 |
|
Aronai Sieyes
|
d4ddd57bf2
|
Merge pull request #4371 from VOREStation/upstream-merge-5656
[MIRROR] Fix plastic ashtrays only holding one butt. Now they hold 4 butts.
|
2018-10-13 17:42:13 -04:00 |
|
Aronai Sieyes
|
20c44e4cf0
|
Merge pull request #4370 from VOREStation/upstream-merge-5655
[MIRROR] Wax can stacxk
|
2018-10-13 17:39:30 -04:00 |
|
Aronai Sieyes
|
01539b5468
|
Merge pull request #4368 from VOREStation/upstream-merge-5648
[MIRROR] Prevents people from HREF exploiting around the R&D console lock.
|
2018-10-13 17:29:47 -04:00 |
|
Atermonera
|
eb1bbac042
|
Merge pull request #5656 from lbnesquik/Kates-AshTray-Fix
Fix plastic ashtrays only holding one butt. Now they hold 4 butts.
|
2018-10-13 17:17:27 -04:00 |
|
Atermonera
|
a74ec39eed
|
Merge pull request #5655 from lbnesquik/Kates-Wax-Fix
Wax can stacxk
|
2018-10-13 17:16:14 -04:00 |
|
Atermonera
|
dde25a46f0
|
Merge pull request #5648 from king5327/polarissciconfix
Prevents people from HREF exploiting around the R&D console lock.
|
2018-10-13 17:14:48 -04:00 |
|
Atermonera
|
54a24d244f
|
Merge pull request #5657 from lbnesquik/Kates-Cap-Fix
Move surgery caps into their own selection.
|
2018-10-13 17:13:32 -04:00 |
|
lbnesquik
|
56ff73f57c
|
Makes water related changes shorter.
|
2018-10-13 09:40:35 +02:00 |
|
Arokha Sieyes
|
5fe59a1f2a
|
Critical maploader fix
Definitely do not update the server without this change.
And a gateway tweak thing because that was my original intent with this branch.
|
2018-10-13 01:36:26 -04:00 |
|
Aronai Sieyes
|
5f10bf5444
|
Merge pull request #4352 from Screemonster/prommiecoreicons
gives prommie cores an icon
|
2018-10-12 21:35:00 -04:00 |
|
Spades
|
4bea97df74
|
Merge pull request #4360 from lbnesquik/Kates-Flight-Tweak
Adjust winged flight cost and description.
|
2018-10-12 19:21:36 -04:00 |
|
Spades
|
85bcb03327
|
Merge pull request #4361 from lbnesquik/Kates-Catgirl-Tweak
Makes it so standard catgirls can appear.
|
2018-10-12 19:18:52 -04:00 |
|
Spades
|
561f196591
|
Merge pull request #4336 from Screemonster/pouncechanges
Gives pounces a chance to fail
|
2018-10-12 19:18:29 -04:00 |
|
Screemonster
|
f513ca75bb
|
use the proper proc for this thing
|
2018-10-12 15:34:02 +01:00 |
|
lbnesquik
|
7bde126b8c
|
Fixes weird typos.
|
2018-10-12 15:49:27 +02:00 |
|
lbnesquik
|
941896a165
|
Makes it so standard catgirls can appear.
|
2018-10-12 12:34:30 +02:00 |
|
lbnesquik
|
95445d808d
|
Reduce Flight cost
|
2018-10-12 12:24:30 +02:00 |
|
Spades
|
6f48c01382
|
Merge pull request #4333 from kcin2001/fixes
fixes copy paste error
|
2018-10-12 06:00:28 -04:00 |
|
Aronai Sieyes
|
f9159296f9
|
Merge pull request #4358 from VOREStation/aro-traitstats
Log trait and species usage for metrics
|
2018-10-12 01:45:54 -04:00 |
|