Commit Graph

878 Commits

Author SHA1 Message Date
Sharkmare
e4f544eb32 Trying to fix FLUFF 2020-01-11 01:20:11 +01:00
Sharkmare
6f94d6e05e Removes YW/VS Fluff (#110)
* Removes YW/VS Fluff
2020-01-10 21:43:43 +01:00
Razgriz
e8069cd7cd Whitelist fix 2019-12-30 02:36:29 -07:00
Repede
3c9731879a Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map 2019-12-09 17:15:36 -05:00
Hawk_v3
5b13642c12 Merge remote-tracking branch 'upstream/master' 2019-12-08 18:15:35 +00:00
Repede
f9688aea70 Edgyness increase 2019-12-08 01:12:17 -05:00
Repede
461fcfd160 Fixing medal fluff 2019-12-06 16:10:35 -05:00
Keila-coon
b0abdc4491 Merge branch 'master' of https://github.com/Keila-coon/YWPolarisVore 2019-12-01 02:38:56 -04:30
Keila-coon
e10c7d4482 Fluff item request updated
-Deleted the place holder for the modkit
2019-12-01 02:38:52 -04:30
Novacat
cbb5a4bdd4 Merge pull request #6246 from TheFurryFeline/patch-9
Expired Permit Removal
2019-11-29 22:23:40 -05:00
Novacat
defff15e24 Update loadout_fluffitems_vr.dm 2019-11-29 20:56:27 -05:00
Anewbe
1de75f06bf Merge pull request #6548 from Meghan-Rossi/paifix
Fix pAI preferences not loading
2019-11-29 19:49:03 -05:00
Repede
9c61982751 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
# Conflicts:
#	code/game/machinery/vending_yw.dm
#	icons/vore/custom_clothes_yw.dmi
#	vorestation.dme
2019-11-29 19:13:53 -05:00
Keila-coon
698d5d564d Merge branch 'master' into master 2019-11-29 13:07:46 -04:00
Keila-coon
ac7ffd08b8 Update loadout_fluffitems_yw.dm 2019-11-29 12:28:46 -04:30
Keila-coon
228d0df6e3 ditto for medal 2019-11-29 11:02:19 -04:30
Unknown
47bc5e411e Invisible Breath Masks 2019-11-28 19:33:46 -05:00
TheFurryFeline
5956dd62d8 Requested Changes
Includes commenting out gun that had a permit for it.
2019-11-28 11:06:56 -05:00
TheFurryFeline
0c2c70ce48 Whoops.
That feeling when you forget about this little refactor. Pfft.
2019-11-28 09:02:30 -05:00
TheFurryFeline
d0ed6c5702 Fixes Collars Not Spawning
Title. Fixes https://github.com/VOREStation/VOREStation/issues/6225
2019-11-25 21:16:26 -05:00
Repede
7035e30fc3 Fixed blizzard so animals do not get killed
Fixed the exploration shuttle console
Fixed the snowsuits sprites and actually works in cold temp
2019-11-24 16:57:06 -05:00
Hawk_v3
bafec81a0a Merge Upstream 2019-11-22 23:40:13 +00:00
Heroman
0e1b4427fe Fixes loadout being broken 2019-11-22 13:08:09 +10:00
Novacat
11ae9361af Cleans up comments 2019-11-21 20:50:49 -05:00
Heroman3003
e7f2ca8055 Hopefully fixes disappearing loadouts 2019-11-22 11:27:28 +10:00
Wickedtemp
1769dd9e8d Hopefully makes my fluff-stuff spawn WORN
Having a custom bag spawn in my internals box instead of on my back is annoying...also smol name edit because girlfren's character changed the last name spelling of their character and since our characters are married, gotta fix! 

but yeah hopefully this fixes it. it worked on private serber.
2019-11-19 23:34:34 -06:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Heroman3003
ab603cffa4 Finishes up the main shadekin features 2019-11-15 11:13:31 +10:00
Heroman3003
62889c39d9 Removes deprecated code 2019-11-15 08:38:53 +10:00
Meghan-Rossi
a09456b541 Adds a way to set the tag of loadout collars as part of the loadout 2019-11-13 03:42:03 +00:00
Shadow
48ba6c652d Changes character's name for fluff item 2019-11-11 22:56:25 -06:00
Novacat
929ff8077c Merge pull request #6171 from EllyBrown/master
Elly Brown (bacon12366) fluff item.
2019-11-08 16:35:08 -05:00
EllyBrown
96e1934a90 Add files via upload 2019-11-08 21:37:33 +02:00
Hawk_v3
f976948ce3 Merge remote-tracking branch 'upstream/master' 2019-11-07 19:54:10 +00:00
Meghan-Rossi
6bee95ef01 Fluff items
Removes Tasald's coat and loyalty implanter as requested in #6147
Adds Tasald's Cartographer's Uniform as approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1627
adds medals:
Xander Bevin - Conduct - https://forum.vore-station.net/viewtopic.php?f=27&t=1579
Nick Sloan - Conduct - https://forum.vore-station.net/viewtopic.php?f=27&t=1575
Erik Ramadwood - Unity - https://forum.vore-station.net/viewtopic.php?f=27&t=1624
Nolan Conaway - Unity - https://forum.vore-station.net/viewtopic.php?f=27&t=1622

Resolves #6147
2019-11-05 11:28:37 +00:00
Keila-coon
30f1f326bc Fixed a typo for loadout fluff items.
Fixed a typo for Mocha's fluff items
2019-11-03 00:58:07 -04:30
Keila-coon
c79716305d Fixed more typos for fluff items
Fixed a typo for Mocha's fluff items
2019-11-01 08:49:52 -04:30
Keila-coon
fcec9a87f5 Fixed a typo for fluff items
Fixed a typo for the modkit for Moca_The_Porg1
2019-10-30 20:24:26 -04:30
Keila-coon
498906bba3 Fixed another typo for fluff items
Fixed the path for cheekycrenando's fluff item
2019-10-30 00:08:43 -04:30
Keila-coon
7afffc5096 Added modkit for fluff item
Modkit for mocha's suit
2019-10-29 22:34:59 -04:30
Anewbe
d7c0195212 Merge pull request #6500 from KasparoVy/you_tracking_implanted_the_floor
Loadout Implants Properly go in Mob, not on Floor
2019-10-29 20:34:36 -04:00
Rykka Stormheart
c177796c2d Add Sounds to stuff! (Port from VOREStation) 2019-10-29 17:32:08 -04:00
Keila-coon
91015b5828 Merge branch 'master' into master 2019-10-29 15:30:28 -04:00
Keila-coon
4bc71346b0 Added hagawaga and moca_the_porg1 fluff item request plus an extra tail
Roman armor and Explorer suit

Striped tail, colorable
2019-10-29 14:39:25 -04:30
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Repede
411ac25f49 fixes typo with fluff item for srusu 2019-10-27 23:08:11 -04:00
Repede
3e3bb830e2 Fluff items additions
+ NESGamer Lucy Price Cryostatis Thermos
+ Captmatt Kaenin medal of valor
+ Risingstar Stellar heart collar
+ cheeky srusu soviet uniform
2019-10-26 19:43:12 -04:00
Hawk_v3
3c8cd11eac Reupdated Station 1 map 2019-10-24 21:57:58 +01:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00