Commit Graph

1375 Commits

Author SHA1 Message Date
Schnayy
29e187bb83 Adds 10 new clothes + sprite fixes. (#6575) 2019-12-20 00:44:28 -05:00
Novacat
0432002af7 Merge pull request #6327 from VOREStation/upstream-merge-6558
[MIRROR] Change various global species lists to GLOB versions, adds 2 more event subspecies.
2019-12-19 15:46:59 -05:00
Meghan-Rossi
604fd1b74f Resolve conflicts, fix compile errors 2019-12-19 17:49:21 +00:00
Verkister
0c074e501a Fixes loadout webbings/pouches for explorers
Fixes loadout webbing vests and drop pouches lacking explorer access despite clearly stating its presence on the display name.
2019-12-19 15:41:03 +02:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
TheFurryFeline
4fd6dc9868 Fluff Item Fixy
Fixes #5992
2019-12-10 09:41:00 -05:00
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
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
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
Unknown
9d7c9714f3 Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin 2019-11-15 12:12:55 -05:00
Novacat
4763d548ab Merge pull request #6184 from Meghan-Rossi/collartweak
Adds a way to set the tag of loadout collars as part of the loadout
2019-11-15 11:59:56 -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
Rykka
2aeaad8c71 Merge branch 'master' into shep-dev-chat-update 2019-11-13 05:02:33 -07:00
Rykka
45abd9ae01 Testfix/reset filediff 2019-11-13 05:00:38 -07: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
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
Novacat
5e5e972e0b Merge pull request #6165 from Meghan-Rossi/fluffstuff
Fluff items
2019-11-08 13:29:34 -05:00
Atermonera
a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05: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
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
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Rykka
5219c1f97f Stage only files without broken filediff 2019-10-28 15:39:32 -06:00
Mechoid
169d8acedd Medical Expansion 2019-10-19 23:28:38 -04:00
Poojawa
f718201974 Adds Sound Code and toggles 2019-10-13 02:05:16 -05:00
Atermonera
5a3398daec Merge pull request #6473 from Woodratt/09272019_weightbodytype
Port weight/body types to traits
2019-10-06 03:34:05 -04:00
Verkister
855d795357 Some Protean fixes
-Fixes protean regeneration not working at all.
-Fixes not being able to get metal as blob.
-Fixes unblobbing as custom size breaking vertical offset.
-Adds a general use loadout fluff vest planned for a prottie char.
-Fixes blobmob being slow due to mob update movement delays.
-Gives protties trasheat verb.
2019-10-01 10:30:29 +03:00
Heroman
f6f2acca6f Adds Melanie's Skeleton 2019-09-29 14:28:56 +10:00
GeneriedJenelle
c29c821075 Ports Earrings from Baystation 2019-09-25 17:09:11 -04:00
Unknown
bf7be873c9 Removes underscores
Should fix Resh's and Saveloy's fluff items? Maybe?
2019-09-20 17:48:14 -04:00
Heroman
7088a5e6cc Fixes Roiz Lizden's and Chakat Taiga's fluff items 2019-09-16 04:51:12 +10:00
Heroman
6e06dd8f32 Fixes 2019-09-15 12:29:21 +10:00
Heroman
c92960feca Some post-release fixes 2019-09-15 06:27:32 +10:00
Novacat
963436e8a3 Update loadout_fluffitems_vr.dm 2019-09-13 20:17:21 -04:00
Novacat
4dbf311e51 Deletes Aronai's all access ID 2019-09-13 20:00:37 -04:00
Mewchild
111d437e24 Fixes 2019-09-13 13:22:46 -05:00
Mewchild
fbc5503bd7 Lower cases ckeys, approves Tachika's medal 2019-09-12 01:30:26 -05:00
Novacat
0e6ba773be Update loadout.dm 2019-09-11 22:09:10 -04:00
Unknown
d35f65ca6c Fixes PR 2019-09-11 22:05:30 -04:00
Mewchild
9d5a07e352 VS, Not Cit. 2019-09-11 14:29:34 -05:00