cadyn
425ce61041
Merge pull request #884 from Kazzc/SC-MapUpdate
...
Civilian sector overhaul.
2020-11-22 01:08:56 -08:00
cadyn
2d06259229
Merge pull request #880 from CHOMPStationBot/upstream-merge-9312
...
[MIRROR] Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings
2020-11-21 19:58:29 -08:00
Kassc
9d660c4222
Merge pull request #1 from CHOMPStation2/master
...
merge master into branch
2020-11-21 21:24:20 -05:00
cadyn
0ce5d797be
Update 07_traits.dm
2020-11-21 14:06:36 -08:00
cadyn
ca04b0ef72
Make the station gateway work :p
2020-11-21 13:24:49 -08:00
Kassc Zeravla
ddc68a5917
Civilian sector overhaul.
...
SC Floor 2
-Overhaul to the civilian sector.
-Merged Cafeteria with Library
-Dorm section is now being remodeled (Will reconstruct to a Gym)
-Old cafeteria is now a snacking room for holodeck.
SC Floor 3
-Added a gateway that is currently under construction (Future arrival point for players)
-Modified and editied some of the dorms and content laying around.
Central Command
-Fixed a wall that lead to space.
SC Areams.DM
-Added additional areas for the third floor. Such as gateway area and its hallways.
Scarf icon update.
Zebra Scarf and Xmas Scarf got a sprite update, credit goes to "ProgrammerDuck"
2020-11-21 03:31:40 -05:00
Chompstation Bot
2e15527ef0
Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings
2020-11-20 15:44:21 +00:00
Razgriz
6a8749d257
Hotkeys by default
...
It's 2020, use your WASD keys by default. Flipped to True
2020-11-19 21:48:52 -07:00
r4d6
18673505f6
Another move.
2020-11-10 00:06:36 -05:00
r4d6
60215f5b7e
Merge branch 'cigar' of https://github.com/r4d6/CHOMPStation2 into cigar
2020-11-10 00:05:47 -05:00
r4d6
d628ce8ff4
Move the cigar cases to a new _ch file
2020-11-10 00:04:17 -05:00
r4d6
8b91ad3a37
Add chomp edits
2020-11-09 23:48:19 -05:00
r4d6
d0cbf7f856
Add cigar cases to the loadout.
2020-11-09 19:23:00 -05:00
Razgriz
5cf20997f0
Merge pull request #816 from CHOMPStationBot/upstream-merge-9290
...
[MIRROR] [MIRROR] Ports some clothing from uristcode
2020-11-08 17:16:46 -07:00
Verkister
270aa28416
Merge pull request #9290 from VOREStation/upstream-merge-7751
...
[MIRROR] Ports some clothing from uristcode
2020-11-08 06:58:52 +00:00
Cadyn
947fe850ff
Yummy bugfixes
2020-10-27 19:58:49 -07:00
Nadyr
30717d0f05
Merge pull request #749 from cadyn/linguist
...
Cadyn's traits changes part 1
2020-10-26 00:01:38 -04:00
Cadyn
bd2e76e4e8
Cadyn's traits changes part 1
2020-10-22 20:02:21 -07:00
r4d6
0b0f756bce
Why it was commented out
2020-10-21 13:37:59 -04:00
r4d6
f27f770c30
Fix being able to select synth-blacklisted traits
2020-10-21 13:37:18 -04:00
Verkister
fb1b3d210e
Merge pull request #9241 from VOREStation/upstream-merge-7733
...
[MIRROR] 5 new clothes & 1 headdress
2020-10-19 10:36:41 +00:00
LunarFleet
163dc56069
Only eggs can sustain me
2020-10-15 20:34:13 -04:00
Razgriz
00ae0b4746
Reversion and inversion
...
lol
2020-10-06 23:51:04 -07:00
Cadyn
1d0e69633f
Fix silly stuff
2020-10-05 19:46:50 -07:00
Cadyn
07775449d7
Fixing conflicts
2020-10-05 18:10:53 -07:00
Razgriz
136e589b15
Reorganize toggle verbs
...
Because having these being worlds apart makes it easy for them to get lost.
2020-10-05 01:44:39 -07:00
Razgriz
64ed8a42c1
Swap default door sounds
2020-10-04 22:16:20 -07:00
Heroman
7d1828f2b4
Fixes = typo
2020-10-04 19:50:30 +10:00
Heroman
bd8e240211
Standartizes gear_tweaks on _vr only items
2020-10-04 19:47:42 +10:00
Riley
ec42a286d0
Clara's Vacuum Flask
...
Accepted Fluff Request: https://forum.vore-station.net/viewtopic.php?f=26&t=1831
Load out cost is one, the same as a standard vacuum flask, no freebies here!
Big thanks to everyone who put up with my confused screaming, especially Heroman :)
2020-09-29 18:01:07 -04:00
Heroman
c9a019ee01
Adds Charles' Tophat
2020-09-28 04:54:23 +10:00
Novacat
65c677ba30
Merge pull request #9088 from ShadowLarkens/shadow_fluff
...
Add Shadow Larkens laptop fluff item
2020-09-26 21:16:21 -04:00
Atermonera
123a0fd115
Merge pull request #7685 from Greenjoe12345/teshstuff-and-eyepatch
...
Teshari sprites and white eyepatch
2020-09-26 16:58:44 -04:00
Razgriz
54e632ebf2
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
ShadowLarkens
bf73137818
Add Shadow Larkens laptop fluff item
2020-09-20 03:35:28 -07:00
Izac Joof Forsgren
4e7b4df749
Merge branch 'master' into izac
2020-09-14 14:11:02 +02:00
izac112
5fbb0b16b9
Voreupdate
2020-09-13 15:06:19 +02:00
izac112
4b051c23fc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
Braiden
0ca81bcdc2
another letter
2020-09-10 03:29:12 -05:00
Braiden
5e1b471925
A gift for Jeanne and an upgrade for Strix
2020-09-09 19:43:50 -05:00
Novacat
549d875f53
Update preferences.dm
2020-09-05 12:16:09 -04:00
listerla
2b600cbe85
Changes default skin tone from 35 to 110
2020-09-05 11:09:18 -04:00
Atermonera
f612958f0c
Merge pull request #7603 from Greenjoe12345/customloadout
...
adds the ability to give loadout items a custom name/description
2020-09-04 22:31:18 -04:00
Atermonera
2a3a5483b0
Merge pull request #7589 from listerla/toelessjackboots
...
Adds toe-less jackboots to xenowear
2020-08-31 23:37:18 -04:00
Novacat
1fcb6bf337
Merge pull request #8896 from Rykka-Stormheart/shep-dev-airlock-sound-prefs
...
Adds Toggles to Revert to Legacy Door Sounds and Enable Department Doors
2020-08-31 15:29:13 -04:00
Braiden
9415302551
again
2020-08-30 00:09:37 -05:00
Braiden
789f9afeed
case sensetive and path fix
2020-08-30 00:09:06 -05:00
MrSign
f490bec8e2
adds toeless jackboots to loadout
2020-08-30 09:15:16 +10:00
MrSign
e0486dc479
Update loadout_shoes.dm
2020-08-30 09:00:50 +10:00
Braiden
eb40f1d483
adjustments and loadout addition
2020-08-29 16:31:04 -05:00
