3954bedb9d
Merge pull request #9606 from VOREStation/upstream-merge-7834
...
[MIRROR] fixes some sprites, adds a thin blindfold
2021-01-25 03:09:35 +00:00
d9c7aba53d
Merge pull request #9544 from VOREStation/upstream-merge-7803
...
[MIRROR] Fixes dark click catcher
2021-01-24 06:57:14 +00:00
50baa06fea
fuck you travis CI
2021-01-19 21:06:28 +13:00
0303df5b07
Merge pull request #1110 from BlackMajor/gut
...
Belly Filler 2: Electric Boogaloo, the Turniping
2021-01-13 22:14:27 -07:00
8673bcad39
Adjustments following feedback
2021-01-14 03:36:05 +13:00
82f5c6019a
this took way too long
2021-01-12 02:19:43 +13:00
12ce67b2fa
Adds a bunch of animal furs
...
Whooeee
2021-01-09 22:04:09 +01:00
fb2db44754
Merge pull request #9528 from Tenryumi/fluff-skirt-outfit-blacklisting
...
Adds fluff skirt outfits to loadout blacklist
2020-12-28 18:24:26 +00:00
e481ed54e5
Merge pull request #9474 from lukevale/master
...
Adds in Measuring cups, and nickname's to the character load selection.
2020-12-18 19:32:12 +00:00
7dd48c64ad
Changes KHI suits to GE
2020-12-13 07:05:29 -05:00
a087cb2c92
Update loadout_xeno.dm
2020-12-08 03:19:23 -05:00
cfb73d6862
Update loadout_xeno.dm
2020-12-07 21:37:06 -07:00
7b30714172
[MIRROR] Adds & Upgrades a Bunch of Teshari Clothing
2020-12-04 20:07:48 +00:00
e3f5bcae0e
Merge pull request #9399 from KillianKirilenko/kk-misc
...
KHI Cargo/Civ Uniforms
2020-12-02 15:24:50 +00:00
02d4f0e3db
Merge pull request #951 from CHOMPStationBot/upstream-merge-9333
...
[MIRROR] Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
2020-11-30 23:55:06 -07:00
cf83958de7
Merge pull request #944 from CHOMPStationBot/upstream-merge-9378
...
[MIRROR] Greek Chiton
2020-11-30 23:18:42 -07:00
a9f77823d7
Merge pull request #9333 from Tenryumi/nikki-fluff
...
Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
2020-11-30 23:46:15 +00:00
351b49203e
Merge pull request #9378 from dwinters99/ridge-wallet
...
Greek Chiton
2020-11-29 15:35:58 +00:00
da85f80845
Ports Cool Stuff from Bastion of Hestia/Vesta, Adds Eye Layer-Switching
2020-11-24 00:54:34 +00:00
425ce61041
Merge pull request #884 from Kazzc/SC-MapUpdate
...
Civilian sector overhaul.
2020-11-22 01:08:56 -08:00
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
9d660c4222
Merge pull request #1 from CHOMPStation2/master
...
merge master into branch
2020-11-21 21:24:20 -05:00
0ce5d797be
Update 07_traits.dm
2020-11-21 14:06:36 -08:00
ca04b0ef72
Make the station gateway work :p
2020-11-21 13:24:49 -08:00
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
2e15527ef0
Ports a Boatload of Teshari Customization from CitRP, Chomp & YW, Small Update to Protogen Markings
2020-11-20 15:44:21 +00:00
6a8749d257
Hotkeys by default
...
It's 2020, use your WASD keys by default. Flipped to True
2020-11-19 21:48:52 -07:00
18673505f6
Another move.
2020-11-10 00:06:36 -05:00
60215f5b7e
Merge branch 'cigar' of https://github.com/r4d6/CHOMPStation2 into cigar
2020-11-10 00:05:47 -05:00
d628ce8ff4
Move the cigar cases to a new _ch file
2020-11-10 00:04:17 -05:00
8b91ad3a37
Add chomp edits
2020-11-09 23:48:19 -05:00
d0cbf7f856
Add cigar cases to the loadout.
2020-11-09 19:23:00 -05:00
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
270aa28416
Merge pull request #9290 from VOREStation/upstream-merge-7751
...
[MIRROR] Ports some clothing from uristcode
2020-11-08 06:58:52 +00:00
947fe850ff
Yummy bugfixes
2020-10-27 19:58:49 -07:00
30717d0f05
Merge pull request #749 from cadyn/linguist
...
Cadyn's traits changes part 1
2020-10-26 00:01:38 -04:00
bd2e76e4e8
Cadyn's traits changes part 1
2020-10-22 20:02:21 -07:00
0b0f756bce
Why it was commented out
2020-10-21 13:37:59 -04:00
f27f770c30
Fix being able to select synth-blacklisted traits
2020-10-21 13:37:18 -04:00
fb1b3d210e
Merge pull request #9241 from VOREStation/upstream-merge-7733
...
[MIRROR] 5 new clothes & 1 headdress
2020-10-19 10:36:41 +00:00
163dc56069
Only eggs can sustain me
2020-10-15 20:34:13 -04:00
00ae0b4746
Reversion and inversion
...
lol
2020-10-06 23:51:04 -07:00
1d0e69633f
Fix silly stuff
2020-10-05 19:46:50 -07:00
07775449d7
Fixing conflicts
2020-10-05 18:10:53 -07:00
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
64ed8a42c1
Swap default door sounds
2020-10-04 22:16:20 -07:00
7d1828f2b4
Fixes = typo
2020-10-04 19:50:30 +10:00
bd8e240211
Standartizes gear_tweaks on _vr only items
2020-10-04 19:47:42 +10:00
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
c9a019ee01
Adds Charles' Tophat
2020-09-28 04:54:23 +10:00
Novacat