Commit Graph

1508 Commits

Author SHA1 Message Date
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
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
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
Novacat
5e5e972e0b Merge pull request #6165 from Meghan-Rossi/fluffstuff
Fluff items
2019-11-08 13:29:34 -05:00
Hawk_v3
f976948ce3 Merge remote-tracking branch 'upstream/master' 2019-11-07 19:54:10 +00: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
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
Rykka
5219c1f97f Stage only files without broken filediff 2019-10-28 15:39:32 -06: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
DameonOwen
22674b143a Fix cookie not deleting self. Add cookie to Amber Owen's loadout. 2019-10-19 15:25:31 -04:00
Poojawa
f718201974 Adds Sound Code and toggles 2019-10-13 02:05:16 -05:00
Repede
7bd184600a Self-indulge commit: Adds CC Officer colored uniform and cloak for Teshari.
Fluffed it to Strix Hades as a loadout option.
2019-10-08 19:20:27 -04:00
Hawk_v3
2cc8800ede Merge remote-tracking branch 'upstream/master' 2019-10-08 15:14:36 +01: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
Hawk_v3
6e801b1e8e Map Updates. 2019-10-04 01:52:44 +01:00
gozulio
02ab22cae8 Properly fixes white cane
Properly fixes white cane fluff item and corrects misleading comment in example code comment.
2019-10-02 21:55:27 -04:00
gozulio
e90dc57a71 Attempt to fix white cane, Removes character_name whitelist 2019-10-02 20:11:47 -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
gozulio
a0500afe7c Ad Jessie's white cane item 2019-10-01 02:44:38 -04:00
Repede
041da2cfbd Merge branch 'self' of https://github.com/Yawn-Wider/YWPolarisVore into self 2019-09-30 14:30:12 -04:00
Repede
6c0e8a9728 Takira fluff suit and mask, no armor values. 2019-09-30 14:29:26 -04:00
Hawk_v3
f186d115d6 Merge remote-tracking branch 'upstream/master' 2019-09-29 21:53:16 +01:00
Hawk_v3
691a1239f4 Merge from Vorestation 2019-09-29 21:53:09 +01:00
Repede
d15543309e b i g b r a i n - Fixing typo 2019-09-29 14:14:57 -04:00
Repede
70f3576ba2 Strix new headset 2019-09-29 14:08:07 -04: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
Hawk_v3
b22f2284fe Merge remote-tracking branch 'upstream/master' 2019-09-23 20:55:18 +01:00
Unknown
bf7be873c9 Removes underscores
Should fix Resh's and Saveloy's fluff items? Maybe?
2019-09-20 17:48:14 -04:00